Mercurial > mm7
changeset 1103:db395ce89ede
struct/class incostintency
| author | Grumpy7 |
|---|---|
| date | Mon, 27 May 2013 21:30:40 +0200 |
| parents | 79010db96ade |
| children | 5d5c78088274 |
| files | CShow.h GammaControl.h Keyboard.h LOD.h LightmapBuilder.h Mouse.h ParticleEngine.h Sprites.h Vis.h |
| diffstat | 9 files changed, 24 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/CShow.h Mon May 27 15:57:58 2013 +0100 +++ b/CShow.h Mon May 27 21:30:40 2013 +0200 @@ -17,8 +17,9 @@ #pragma pack(push, 1) -struct CShow +class CShow { +public: //----- (004A9507) -------------------------------------------------------- CShow() {}
--- a/GammaControl.h Mon May 27 15:57:58 2013 +0100 +++ b/GammaControl.h Mon May 27 21:30:40 2013 +0200 @@ -2,8 +2,9 @@ #include "lib\legacy_dx\d3d.h" #pragma pack(push, 1) -struct GammaController +class GammaController { +public: GammaController(); inline ~GammaController() {} //----- (0044F22E)
--- a/Keyboard.h Mon May 27 15:57:58 2013 +0100 +++ b/Keyboard.h Mon May 27 21:30:40 2013 +0200 @@ -77,8 +77,9 @@ #pragma pack(pop) #pragma pack(push, 1) -struct Keyboard +class Keyboard { +public: Keyboard(); bool WasKeyPressed(int vKey); bool IsKeyBeingHeld(int vKey);
--- a/LOD.h Mon May 27 15:57:58 2013 +0100 +++ b/LOD.h Mon May 27 21:30:40 2013 +0200 @@ -5,6 +5,7 @@ #include "Texture.h" +class Sprite; /* 354 */ enum TEXTURE_TYPE @@ -283,7 +284,7 @@ int field_ECA4; int field_ECA8; int field_ECAC; - struct Sprite *pHardwareSprites; + Sprite *pHardwareSprites; int field_ECB4; }; #pragma pack(pop)
--- a/LightmapBuilder.h Mon May 27 15:57:58 2013 +0100 +++ b/LightmapBuilder.h Mon May 27 21:30:40 2013 +0200 @@ -27,8 +27,9 @@ /* 114 */ #pragma pack(push, 1) -struct LightmapBuilder +class LightmapBuilder { +public: LightmapBuilder(); virtual ~LightmapBuilder() //----- (0045BBAA) {}
--- a/Mouse.h Mon May 27 15:57:58 2013 +0100 +++ b/Mouse.h Mon May 27 21:30:40 2013 +0200 @@ -7,8 +7,9 @@ /* 107 */ #pragma pack(push, 1) -struct ThreadWard +class ThreadWard { +public: //----- (00438B0B) -------------------------------------------------------- inline ThreadWard() { @@ -41,8 +42,9 @@ /* 106 */ #pragma pack(push, 1) -struct Mouse +class Mouse { +public: //----- (00467E4E) -------------------------------------------------------- inline Mouse(ThreadWard *pWard) {
--- a/ParticleEngine.h Mon May 27 15:57:58 2013 +0100 +++ b/ParticleEngine.h Mon May 27 21:30:40 2013 +0200 @@ -105,8 +105,9 @@ /* 110 */ #pragma pack(push, 1) -struct ParticleEngine +class ParticleEngine { +public: ParticleEngine(); void ResetParticles();
--- a/Sprites.h Mon May 27 15:57:58 2013 +0100 +++ b/Sprites.h Mon May 27 21:30:40 2013 +0200 @@ -3,8 +3,9 @@ /* 18 */ #pragma pack(push, 1) -struct Sprite //28h +class Sprite //28h { +public: void Release(); const char *pName; //0 @@ -23,8 +24,9 @@ /* 42 */ #pragma pack(push, 1) -struct SpriteFrame +class SpriteFrame { +public: char pIconName[12]; char pTextureName[12]; //c __int16 pHwSpriteIDs[8]; //18h @@ -65,8 +67,8 @@ signed int uNumSpriteFrames; unsigned int uNumEFrames;//field_4; int unused_field; //field_8 - struct SpriteFrame *pSpriteSFrames; //0c - struct SpriteFrame **pSpritePFrames; //10h + SpriteFrame *pSpriteSFrames; //0c + SpriteFrame **pSpritePFrames; //10h __int16 *pSpriteEFrames; //14h }; #pragma pack(pop)