diff --git a/main.cpp b/main.cpp index 90a3e84..61e669b 100644 --- a/main.cpp +++ b/main.cpp @@ -398,6 +398,7 @@ int main() validate_CElectroLine(); validate_CFireyExplosion(); validate_CFlamingImpactWeb(); + validate_CTripWire(); puts("[*] Validation done!"); diff --git a/tools/prototype_spitter.py b/tools/prototype_spitter.py index 970e9f0..6951c7c 100644 --- a/tools/prototype_spitter.py +++ b/tools/prototype_spitter.py @@ -50,7 +50,9 @@ def set_widthed_type(entry): ''' entry = replace_type('ulong', 'u32', entry) entry = replace_type('uint', 'u32', entry) + entry = replace_type('ushort', 'u16', entry) entry = replace_type('int', 'i32', entry) + entry = replace_type('short', 'i16', entry) entry = replace_type('uchar', 'u8', entry) diff --git a/wire.cpp b/wire.cpp index d29239f..d623e3b 100644 --- a/wire.cpp +++ b/wire.cpp @@ -2,16 +2,68 @@ #include "validate.h" +// @SMALLTODO +void CLaserFence::AI(void) +{ + printf("CLaserFence::AI(void)"); +} + +// @SMALLTODO +CLaserFence::CLaserFence(short *,i32,bool) +{ + printf("CLaserFence::CLaserFence(short *,i32,bool)"); +} + +// @SMALLTODO +void CLaserFence::CommonInitialisation(bool) +{ + printf("CLaserFence::CommonInitialisation(bool)"); +} + +// @SMALLTODO +CLaserFence::~CLaserFence(void) +{ + printf("CLaserFence::~CLaserFence(void)"); +} + +// @MEDIUMTODO +void CTripWire::AI(void) +{ + printf("CTripWire::AI(void)"); +} + +// @SMALLTODO +void CTripWire::BuildTripWire(void) +{ + printf("CTripWire::BuildTripWire(void)"); +} + +// @SMALLTODO +CTripWire::CTripWire(i16 *,u16) +{ + printf("CTripWire::CTripWire(short *,ushort)"); +} + +// @SMALLTODO +CTripWire::~CTripWire(void) +{ + printf("CTripWire::~CTripWire(void)"); +} + // @Ok void CLaserFence::SetPushback(bool pushback) { this->field_114 = pushback; } - void validate_CLaserFence(void) { VALIDATE_SIZE(CLaserFence, 0x11C); VALIDATE(CLaserFence, field_114, 0x114); } + +void validate_CTripWire(void) +{ + VALIDATE_SIZE(CTripWire, 0x114); +} diff --git a/wire.h b/wire.h index 036fb85..e58c00c 100644 --- a/wire.h +++ b/wire.h @@ -9,6 +9,12 @@ class CLaserFence : public CBody { public: + EXPORT CLaserFence(short *,i32,bool); + EXPORT virtual ~CLaserFence(void); + EXPORT virtual void AI(void); + + EXPORT void CommonInitialisation(bool); + EXPORT void SetPushback(bool); unsigned char topPad[0x114-0xF4]; @@ -17,6 +23,18 @@ class CLaserFence : public CBody unsigned char bottomPad[0x11C-0x114-1]; }; +class CTripWire : public CBody +{ + public: + EXPORT CTripWire(i16 *,u16); + EXPORT virtual ~CTripWire(void); + EXPORT virtual void AI(void); + + EXPORT void BuildTripWire(void); + u8 padBottom[0x20]; +}; + void validate_CLaserFence(void); +void validate_CTripWire(void); #endif