Fix CSuper size

This commit is contained in:
krystalgamer 2024-09-06 20:13:15 +02:00
parent 9229943896
commit e2e23d8cad
8 changed files with 13 additions and 68 deletions

View File

@ -747,5 +747,5 @@ void stateLog(char const *,...)
void validate_DXsound(void)
{
VALIDATE_SIZE(_GUID, 0x16);
VALIDATE_SIZE(_GUID, 0x10);
}

View File

@ -63,9 +63,7 @@ public:
EXPORT virtual void SetVariable(unsigned __int16);
EXPORT virtual unsigned __int16 GetVariable(unsigned __int16);
int field_194;
int field_198;
unsigned char padAfter198[0x1A8-0x198-4];
u8 padAfter1A4[4];
CVector field_1A8[6];

View File

@ -163,105 +163,55 @@ i32 validate(void)
validate_CItem();
validate_CVector();
validate_CSVector();
validate_CBit();
validate_CQuadBit();
validate_CFT4Bit();
validate_CFlatBit();
validate_CBody();
validate_SVector();
validate_CSuper();
validate_CBaddy();
validate_CMJ();
validate_CSubmariner();
validate_CVenom();
validate_CBlackCat();
validate_CTorch();
validate_CHostage();
validate_CScriptOnlyBaddy();
validate_CCop();
validate_CCarnage();
validate_CChopper();
validate_CDocOc();
validate_CJonah();
validate_CLizard();
validate_CLizMan();
validate_CMystFoot();
validate_CMysterio();
validate_CSoftSpot();
validate_CPlatform();
validate_CRhino();
validate_CScorpion();
validate_CPunchOb();
validate_CSimby();
validate_CSimbyBase();
validate_CSpClone();
validate_CSuperDocOck();
validate_CThug();
validate_CTurret();
validate_MATRIX();
validate_CRudeWordHitterSpidey();
validate_CBulletFrag();
validate_CImpactWeb();
validate_CDomePiece();
validate_CDome();
validate_CDomeRing();
validate_CWeb();
validate_CSwinger();
validate_CTurretBase();
validate_CDummy();
validate_CSniperSplat();
validate_SStateFlags();
validate_CGPolyLine();
validate_CCamera();

2
ob.cpp
View File

@ -791,6 +791,8 @@ void validate_CSuper(void){
unsigned char field_142;
__int16 field_148;
*/
VALIDATE_SIZE(CSuper, 0x1A4);
VALIDATE(CSuper, field_F4, 0xF4);
VALIDATE(CSuper, field_F8, 0xF8);

5
ob.h
View File

@ -247,6 +247,11 @@ public:
void* field_188;
unsigned char padEE[0x4];
__int16 *actualcsuperend;
i32 field_194;
i32 field_198;
u8 padCsuperBottom[0x8];
};

12
shell.h
View File

@ -36,15 +36,12 @@ class CShellMysterioHeadGlow : public CWobblyGlow
unsigned char padBottom[0xA8-0xA4-2];
};
class CRudeWordHitterSpidey : public CSuper {
class CRudeWordHitterSpidey : public CSuper
{
public:
EXPORT CRudeWordHitterSpidey(void);
EXPORT void AI(void);
u32 field_194;
u8 padAfter194[0x1A4-0x194-4];
i32 field_1A4;
i32 field_1A8;
@ -56,7 +53,6 @@ public:
EXPORT void FadeAway(void);
EXPORT void SelectNewTrack(int);
EXPORT void SelectNewAnim(void);
unsigned char padStart[0x1A4-0x194];
u16* field_1A4;
u16* field_1A8;
@ -93,8 +89,6 @@ class Spidey_CIcon : public CSuper
EXPORT Spidey_CIcon(i32);
EXPORT void AI(void);
EXPORT void SetIcon(i32);
unsigned char pad[0x10];
};
class CShellSymBurn : public CSuper
@ -103,8 +97,6 @@ class CShellSymBurn : public CSuper
EXPORT CShellSymBurn(CVector*);
EXPORT void AI(void);
u8 padTop[0x10];
i32 field_1A4;
};

View File

@ -185,9 +185,8 @@ class CSymBurn : public CSuper
EXPORT CSymBurn(CVector*);
EXPORT virtual ~CSymBurn(void);
EXPORT virtual void AI(void);
EXPORT void AI(void) OVERRIDE;
u8 padTop[0x10];
i32 field_1A4;
};

View File

@ -12,8 +12,7 @@ class CPlayer : public CSuper
{
public:
int field_194;
unsigned char padAfter194[0x1A8-0x194-4];
unsigned char padtop[4];
int field_1A8;
char field_1AC;