comparison Sprites.h @ 1487:cb396f55671e

Слияние
author Ritor1
date Thu, 29 Aug 2013 22:02:00 +0600
parents 7ef4b64f6329
children 35c1e4ff6ba7
comparison
equal deleted inserted replaced
1486:47c89461be23 1487:cb396f55671e
22 #pragma pack(pop) 22 #pragma pack(pop)
23 23
24 24
25 /* 42 */ 25 /* 42 */
26 #pragma pack(push, 1) 26 #pragma pack(push, 1)
27 class SpriteFrame 27 struct SpriteFrame_mm6
28 { 28 {
29 public:
30 char pIconName[12]; 29 char pIconName[12];
31 char pTextureName[12]; //c 30 char pTextureName[12]; //c
32 __int16 pHwSpriteIDs[8]; //18h 31 __int16 pHwSpriteIDs[8]; //18h
33 int scale; //28h 32 int scale; //28h
34 int uFlags; //2c 33 int uFlags; //2c
35 __int16 uGlowRadius; //30 34 __int16 uGlowRadius; //30
36 __int16 uPaletteID; //32 35 __int16 uPaletteID; //32
37 __int16 uPaletteIndex; 36 __int16 uPaletteIndex;
38 __int16 uAnimTime; 37 __int16 uAnimTime;
38 //__int16 uAnimLength;
39 //__int16 _pad;
40 };
41
42 struct SpriteFrame: SpriteFrame_mm6
43 {
39 __int16 uAnimLength; 44 __int16 uAnimLength;
40 __int16 _pad; 45 __int16 _pad;
41 }; 46 };
42 #pragma pack(pop) 47 #pragma pack(pop)
43 48
52 pSpriteSFrames = nullptr; 57 pSpriteSFrames = nullptr;
53 pSpritePFrames = nullptr; 58 pSpritePFrames = nullptr;
54 pSpriteEFrames = nullptr; 59 pSpriteEFrames = nullptr;
55 } 60 }
56 void ToFile(); 61 void ToFile();
57 void FromFile(void *pSerialized); 62 void FromFile(void *data_mm6, void *data_mm7, void *data_mm8);
58 bool FromFileTxt(const char *Args); 63 bool FromFileTxt(const char *Args);
59 void ReleaseSFrames(); 64 void ReleaseSFrames();
60 void ResetSomeSpriteFlags(); 65 void ResetSomeSpriteFlags();
61 void InitializeSprite(signed int uSpriteID); 66 void InitializeSprite(signed int uSpriteID);
62 signed int FastFindSprite(char *pSpriteName); 67 signed int FastFindSprite(char *pSpriteName);