Mercurial > mm7

diff ObjectList.h @ 1477:7ef4b64f6329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents 58b71c1af7d8
children 92511cd8fcdb
line wrap: on
line diff
--- a/ObjectList.h	Wed Aug 28 14:39:01 2013 +0600
+++ b/ObjectList.h	Wed Aug 28 18:43:07 2013 +0200
@@ -24,6 +24,25 @@
 
 /*   56 */
 #pragma pack(push, 1)
+struct ObjectDesc_mm6
+{
+  inline bool NoSprite() const {return uFlags & OBJECT_DESC_NO_SPRITE;}
+
+  char field_0[32];
+  __int16 uObjectID;
+  __int16 uRadius;
+  __int16 uHeight;
+  __int16 uFlags;
+  unsigned __int16 uSpriteID;
+  __int16 uLifetime;
+  unsigned short uParticleTrailColor;
+  __int16 uSpeed;
+  char uParticleTrailColorR;
+  char uParticleTrailColorG;
+  char uParticleTrailColorB;
+  char field_35_clr;
+};
+
 struct ObjectDesc
 {
   inline bool NoSprite() const {return uFlags & OBJECT_DESC_NO_SPRITE;}
@@ -55,7 +74,7 @@
   {}
 
   void ToFile();
-  void FromFile(void *pSerialized);
+  void FromFile(void *data_mm6, void *data_mm7, void *data_mm8);
   bool FromFileTxt(const char *Args);
   void InitializeSprites();
   __int16 ObjectIDByItemID(unsigned __int16 uItemID);