comparison ObjectList.h @ 1477:7ef4b64f6329

* 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
comparison
equal deleted inserted replaced
1475:d7720c1f1d3b 1477:7ef4b64f6329
22 22
23 23
24 24
25 /* 56 */ 25 /* 56 */
26 #pragma pack(push, 1) 26 #pragma pack(push, 1)
27 struct ObjectDesc_mm6
28 {
29 inline bool NoSprite() const {return uFlags & OBJECT_DESC_NO_SPRITE;}
30
31 char field_0[32];
32 __int16 uObjectID;
33 __int16 uRadius;
34 __int16 uHeight;
35 __int16 uFlags;
36 unsigned __int16 uSpriteID;
37 __int16 uLifetime;
38 unsigned short uParticleTrailColor;
39 __int16 uSpeed;
40 char uParticleTrailColorR;
41 char uParticleTrailColorG;
42 char uParticleTrailColorB;
43 char field_35_clr;
44 };
45
27 struct ObjectDesc 46 struct ObjectDesc
28 { 47 {
29 inline bool NoSprite() const {return uFlags & OBJECT_DESC_NO_SPRITE;} 48 inline bool NoSprite() const {return uFlags & OBJECT_DESC_NO_SPRITE;}
30 49
31 char field_0[32]; 50 char field_0[32];
53 inline ObjectList(): //----- (004583D5) 72 inline ObjectList(): //----- (004583D5)
54 uNumObjects(0), pObjects(nullptr) 73 uNumObjects(0), pObjects(nullptr)
55 {} 74 {}
56 75
57 void ToFile(); 76 void ToFile();
58 void FromFile(void *pSerialized); 77 void FromFile(void *data_mm6, void *data_mm7, void *data_mm8);
59 bool FromFileTxt(const char *Args); 78 bool FromFileTxt(const char *Args);
60 void InitializeSprites(); 79 void InitializeSprites();
61 __int16 ObjectIDByItemID(unsigned __int16 uItemID); 80 __int16 ObjectIDByItemID(unsigned __int16 uItemID);
62 81
63 82