diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 8d1fe268..e0178e89 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -40,7 +40,7 @@ IsleApp::IsleApp() m_backBuffersInVram = 1; m_using8bit = 0; m_using16bit = 1; - m_unk24 = 0; + m_unk0x24 = 0; m_drawCursor = 0; m_use3dSound = 1; m_useMusic = 1; @@ -497,7 +497,7 @@ MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine) m_backBuffersInVram, m_using8bit, m_using16bit, - m_unk24, + m_unk0x24, FALSE, m_wideViewAngle, m_deviceId diff --git a/ISLE/isleapp.h b/ISLE/isleapp.h index f83823f0..5abc3a22 100644 --- a/ISLE/isleapp.h +++ b/ISLE/isleapp.h @@ -50,7 +50,7 @@ class IsleApp { // 20 BOOL m_using16bit; - int m_unk24; + int m_unk0x24; BOOL m_use3dSound; BOOL m_useMusic; diff --git a/LEGO1/act3.h b/LEGO1/act3.h index cca3de73..3d627267 100644 --- a/LEGO1/act3.h +++ b/LEGO1/act3.h @@ -24,12 +24,12 @@ class Act3 : public LegoWorld { return !strcmp(p_name, Act3::ClassName()) || LegoWorld::IsA(p_name); } - inline void SetUnkown420c(MxEntity* p_entity) { m_unk420c = p_entity; } + inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; } protected: - undefined m_unkf8[0x4114]; - MxEntity* m_unk420c; - undefined m_unk4210[0x64]; + undefined m_unk0xf8[0x4114]; + MxEntity* m_unk0x420c; + undefined m_unk0x4210[0x64]; }; #endif // ACT3_H diff --git a/LEGO1/act3state.h b/LEGO1/act3state.h index 13e931a5..5da94fac 100644 --- a/LEGO1/act3state.h +++ b/LEGO1/act3state.h @@ -7,7 +7,7 @@ // SIZE 0xc class Act3State : public LegoState { public: - inline Act3State() { m_unk08 = 0; } + inline Act3State() { m_unk0x08 = 0; } // FUNCTION: LEGO1 0x1000e300 inline virtual const char* ClassName() const override // vtable+0x0c @@ -26,7 +26,7 @@ class Act3State : public LegoState { private: // FIXME: May be part of LegoState? Uncertain... - MxU32 m_unk08; + MxU32 m_unk0x08; }; #endif // ACT3STATE_H diff --git a/LEGO1/ambulance.cpp b/LEGO1/ambulance.cpp index 24a67146..1d9ca918 100644 --- a/LEGO1/ambulance.cpp +++ b/LEGO1/ambulance.cpp @@ -7,15 +7,15 @@ DECOMP_SIZE_ASSERT(Ambulance, 0x184); // FUNCTION: LEGO1 0x10035ee0 Ambulance::Ambulance() { - this->m_unk168 = 0; - this->m_unk16a = -1; - this->m_unk164 = 0; - this->m_unk16c = 0; - this->m_unk174 = -1; - this->m_unk16e = 0; - this->m_unk178 = -1; - this->m_unk170 = 0; - this->m_unk172 = 0; - this->m_unk13c = 40.0; - this->m_unk17c = 1.0; + this->m_unk0x168 = 0; + this->m_unk0x16a = -1; + this->m_unk0x164 = 0; + this->m_unk0x16c = 0; + this->m_unk0x174 = -1; + this->m_unk0x16e = 0; + this->m_unk0x178 = -1; + this->m_unk0x170 = 0; + this->m_unk0x172 = 0; + this->m_unk0x13c = 40.0; + this->m_unk0x17c = 1.0; } diff --git a/LEGO1/ambulance.h b/LEGO1/ambulance.h index b2cb15ea..eb46a1ed 100644 --- a/LEGO1/ambulance.h +++ b/LEGO1/ambulance.h @@ -24,18 +24,18 @@ class Ambulance : public IslePathActor { private: // TODO: Ambulance fields - undefined m_unk160[4]; - MxS32 m_unk164; - MxS16 m_unk168; - MxS16 m_unk16a; - MxS16 m_unk16c; - MxS16 m_unk16e; - MxS16 m_unk170; - MxS16 m_unk172; - MxS32 m_unk174; - MxS32 m_unk178; - MxFloat m_unk17c; - undefined m_unk180[4]; + undefined m_unk0x160[4]; + MxS32 m_unk0x164; + MxS16 m_unk0x168; + MxS16 m_unk0x16a; + MxS16 m_unk0x16c; + MxS16 m_unk0x16e; + MxS16 m_unk0x170; + MxS16 m_unk0x172; + MxS32 m_unk0x174; + MxS32 m_unk0x178; + MxFloat m_unk0x17c; + undefined m_unk0x180[4]; }; #endif // AMBULANCE_H diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/ambulancemissionstate.h index 8aaea43b..6f3cc558 100644 --- a/LEGO1/ambulancemissionstate.h +++ b/LEGO1/ambulancemissionstate.h @@ -41,7 +41,7 @@ class AmbulanceMissionState : public LegoState { } protected: - undefined m_unk8[0x12]; + undefined m_unk0x8[0x12]; MxU16 m_color1; MxU16 m_color2; MxU16 m_color3; diff --git a/LEGO1/bike.cpp b/LEGO1/bike.cpp index ac79db87..3c27ebc5 100644 --- a/LEGO1/bike.cpp +++ b/LEGO1/bike.cpp @@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(Bike, 0x164); // FUNCTION: LEGO1 0x10076670 Bike::Bike() { - this->m_unk13c = 20.0; - this->m_unk150 = 3.0; - this->m_unk148 = 1; + this->m_unk0x13c = 20.0; + this->m_unk0x150 = 3.0; + this->m_unk0x148 = 1; } diff --git a/LEGO1/bike.h b/LEGO1/bike.h index 5cf88e11..f3d5c90d 100644 --- a/LEGO1/bike.h +++ b/LEGO1/bike.h @@ -25,7 +25,7 @@ class Bike : public IslePathActor { private: // TODO: Bike fields - undefined m_unk160[4]; + undefined m_unk0x160[4]; }; #endif // BIKE_H diff --git a/LEGO1/dunebuggy.cpp b/LEGO1/dunebuggy.cpp index ac1be042..a32b612d 100644 --- a/LEGO1/dunebuggy.cpp +++ b/LEGO1/dunebuggy.cpp @@ -7,6 +7,6 @@ DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c); // FUNCTION: LEGO1 0x10067bb0 DuneBuggy::DuneBuggy() { - this->m_unk13c = 25.0; - this->m_unk164 = 1.0; + this->m_unk0x13c = 25.0; + this->m_unk0x164 = 1.0; } diff --git a/LEGO1/dunebuggy.h b/LEGO1/dunebuggy.h index 5431f741..1accaa05 100644 --- a/LEGO1/dunebuggy.h +++ b/LEGO1/dunebuggy.h @@ -25,9 +25,9 @@ class DuneBuggy : public IslePathActor { private: // TODO: Double check DuneBuggy field types - undefined4 m_unk160; - MxFloat m_unk164; - undefined4 m_unk168; + undefined4 m_unk0x160; + MxFloat m_unk0x164; + undefined4 m_unk0x168; }; #endif // DUNEBUGGY_H diff --git a/LEGO1/gifmanager.cpp b/LEGO1/gifmanager.cpp index ef4beb22..179ce3e6 100644 --- a/LEGO1/gifmanager.cpp +++ b/LEGO1/gifmanager.cpp @@ -11,7 +11,7 @@ GifMapEntry* DAT_100f0100; // FUNCTION: LEGO1 0x10001cc0 GifMapEntry* GifMap::FindNode(const char*& string) { - GifMapEntry* ret = m_unk4; + GifMapEntry* ret = m_unk0x4; GifMapEntry* current = ret->m_parent; while (current != DAT_100f0100) { if (strcmp(current->m_key, string) <= 0) { diff --git a/LEGO1/gifmanager.h b/LEGO1/gifmanager.h index b5c52971..ba978d9e 100644 --- a/LEGO1/gifmanager.h +++ b/LEGO1/gifmanager.h @@ -33,13 +33,13 @@ class GifMap { { GifData* ret = NULL; GifMapEntry* entry = FindNode(string); - if (((m_unk4 == entry || strcmp(string, entry->m_key) > 0) ? m_unk4 : entry) != entry) + if (((m_unk0x4 == entry || strcmp(string, entry->m_key) > 0) ? m_unk0x4 : entry) != entry) ret = entry->m_value; return ret; } - undefined4 m_unk0; - GifMapEntry* m_unk4; + undefined4 m_unk0x0; + GifMapEntry* m_unk0x4; }; // VTABLE: LEGO1 0x100d86d4 @@ -48,12 +48,12 @@ class GifManagerBase { // STUB: LEGO1 0x1005a310 virtual ~GifManagerBase() {} // vtable+00 - inline GifData* Get(const char* name) { return m_unk8.Get(name); } + inline GifData* Get(const char* name) { return m_unk0x8.Get(name); } protected: - undefined4 m_unk0; - undefined4 m_unk4; - GifMap m_unk8; + undefined4 m_unk0x0; + undefined4 m_unk0x4; + GifMap m_unk0x8; }; // VTABLE: LEGO1 0x100d86fc @@ -63,7 +63,7 @@ class GifManager : public GifManagerBase { virtual ~GifManager() {} // vtable+00 protected: - undefined m_unk[0x1c]; + undefined m_unk0x[0x1c]; }; #endif // GIFMANAGER_H diff --git a/LEGO1/helicopter.cpp b/LEGO1/helicopter.cpp index 4397ae55..582e2539 100644 --- a/LEGO1/helicopter.cpp +++ b/LEGO1/helicopter.cpp @@ -13,7 +13,7 @@ DECOMP_SIZE_ASSERT(Helicopter, 0x230) // FUNCTION: LEGO1 0x10001e60 Helicopter::Helicopter() { - m_unk13c = 60; + m_unk0x13c = 60; } // FUNCTION: LEGO1 0x10003230 @@ -63,16 +63,16 @@ void Helicopter::VTable0xe4() } } m_state->SetUnknown8(0); - FUN_1003ee00(m_unk22c, 0x16); - FUN_1003ee00(m_unk22c, 0x17); - FUN_1003ee00(m_unk22c, 0x18); - FUN_1003ee00(m_unk22c, 0x19); - FUN_1003ee00(m_unk22c, 0x1a); - FUN_1003ee00(m_unk22c, 0x1b); - FUN_1003ee00(m_unk22c, 0x1c); - FUN_1003ee00(m_unk22c, 0x1d); - FUN_1003ee00(m_unk22c, 0x1e); - FUN_1003ee00(m_unk22c, 0x1f); + FUN_1003ee00(m_unk0x22c, 0x16); + FUN_1003ee00(m_unk0x22c, 0x17); + FUN_1003ee00(m_unk0x22c, 0x18); + FUN_1003ee00(m_unk0x22c, 0x19); + FUN_1003ee00(m_unk0x22c, 0x1a); + FUN_1003ee00(m_unk0x22c, 0x1b); + FUN_1003ee00(m_unk0x22c, 0x1c); + FUN_1003ee00(m_unk0x22c, 0x1d); + FUN_1003ee00(m_unk0x22c, 0x1e); + FUN_1003ee00(m_unk0x22c, 0x1f); AnimationManager()->FUN_1005f6d0(TRUE); ControlManager()->Unregister(this); } diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h index a4bd8537..1bb7c22a 100644 --- a/LEGO1/helicopter.h +++ b/LEGO1/helicopter.h @@ -32,14 +32,14 @@ class Helicopter : public IslePathActor { virtual ~Helicopter() override; // vtable+0x0 protected: - Matrix4Data m_unk160; - Matrix4Data m_unk1a8; - undefined4 m_unk1f0; - Vector4Data m_unk1f4; - Vector4Data m_unk20c; - undefined4 m_unk224; + Matrix4Data m_unk0x160; + Matrix4Data m_unk0x1a8; + undefined4 m_unk0x1f0; + Vector4Data m_unk0x1f4; + Vector4Data m_unk0x20c; + undefined4 m_unk0x224; HelicopterState* m_state; - MxAtomId m_unk22c; + MxAtomId m_unk0x22c; private: void GetState(); diff --git a/LEGO1/helicopterstate.h b/LEGO1/helicopterstate.h index ba3ed823..55575b94 100644 --- a/LEGO1/helicopterstate.h +++ b/LEGO1/helicopterstate.h @@ -21,10 +21,10 @@ class HelicopterState : public LegoState { return !strcmp(p_name, HelicopterState::ClassName()) || LegoState::IsA(p_name); } - inline void SetUnknown8(undefined4 p_unk8) { m_unk8 = p_unk8; } + inline void SetUnknown8(undefined4 p_unk8) { m_unk0x8 = p_unk8; } protected: - undefined4 m_unk8; + undefined4 m_unk0x8; }; #endif // HELICOPTERSTATE_H diff --git a/LEGO1/islepathactor.cpp b/LEGO1/islepathactor.cpp index 805fc287..0cf601dc 100644 --- a/LEGO1/islepathactor.cpp +++ b/LEGO1/islepathactor.cpp @@ -38,9 +38,9 @@ void IslePathActor::VTable0xd8() IslePathActor::IslePathActor() { this->m_pLegoWorld = NULL; - this->m_unk13c = 6.0; - this->m_unk15c = 1.0; - this->m_unk158 = 0; + this->m_unk0x13c = 6.0; + this->m_unk0x15c = 1.0; + this->m_unk0x158 = 0; } // FUNCTION: LEGO1 0x1001a280 diff --git a/LEGO1/islepathactor.h b/LEGO1/islepathactor.h index 71384569..0fbe6eff 100644 --- a/LEGO1/islepathactor.h +++ b/LEGO1/islepathactor.h @@ -44,8 +44,8 @@ class IslePathActor : public LegoPathActor { private: LegoWorld* m_pLegoWorld; // 0x154 - MxFloat m_unk158; - MxFloat m_unk15c; + MxFloat m_unk0x158; + MxFloat m_unk0x15c; }; #endif // ISLEPATHACTOR_H diff --git a/LEGO1/jetski.cpp b/LEGO1/jetski.cpp index 859e9ff9..8bdf3fff 100644 --- a/LEGO1/jetski.cpp +++ b/LEGO1/jetski.cpp @@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(Jetski, 0x164); // FUNCTION: LEGO1 0x1007e3b0 Jetski::Jetski() { - this->m_unk13c = 25.0; - this->m_unk150 = 2.0; - this->m_unk148 = 1; + this->m_unk0x13c = 25.0; + this->m_unk0x150 = 2.0; + this->m_unk0x148 = 1; } diff --git a/LEGO1/jetski.h b/LEGO1/jetski.h index c8341538..8c669ca6 100644 --- a/LEGO1/jetski.h +++ b/LEGO1/jetski.h @@ -25,7 +25,7 @@ class Jetski : public IslePathActor { private: // TODO: Jetski fields - undefined m_unk160[4]; + undefined m_unk0x160[4]; }; #endif // JETSKI_H diff --git a/LEGO1/lego3dmanager.h b/LEGO1/lego3dmanager.h index 64be10b9..f7638649 100644 --- a/LEGO1/lego3dmanager.h +++ b/LEGO1/lego3dmanager.h @@ -8,8 +8,8 @@ class Lego3DManager { inline Lego3DView* GetLego3DView() { return this->m_3dView; } private: - int m_unk00; - int m_unk04; + int m_unk0x00; + int m_unk0x04; Lego3DView* m_3dView; }; diff --git a/LEGO1/legoactor.cpp b/LEGO1/legoactor.cpp index c67a792f..1ca8e367 100644 --- a/LEGO1/legoactor.cpp +++ b/LEGO1/legoactor.cpp @@ -6,46 +6,46 @@ DECOMP_SIZE_ASSERT(LegoActor, 0x78) // FUNCTION: LEGO1 0x10002cc0 MxFloat LegoActor::VTable0x50() { - return m_unk68; + return m_unk0x68; } // FUNCTION: LEGO1 0x10002cd0 void LegoActor::VTable0x54(MxFloat p_unk) { - m_unk68 = p_unk; + m_unk0x68 = p_unk; } // FUNCTION: LEGO1 0x10002ce0 void LegoActor::VTable0x58(MxFloat p_unk) { - m_unk70 = p_unk; + m_unk0x70 = p_unk; } // FUNCTION: LEGO1 0x10002cf0 MxFloat LegoActor::VTable0x5c() { - return m_unk70; + return m_unk0x70; } // FUNCTION: LEGO1 0x10002d00 undefined LegoActor::VTable0x60() { - return m_unk74; + return m_unk0x74; } // FUNCTION: LEGO1 0x10002d10 void LegoActor::VTable0x64(undefined p_unk) { - m_unk74 = p_unk; + m_unk0x74 = p_unk; } // End header // FUNCTION: LEGO1 0x1002d110 LegoActor::LegoActor() { - m_unk68 = 0.0f; - m_unk6c = 0; - m_unk70 = 0.0f; - m_unk10 = 0; - m_unk74 = 0; + m_unk0x68 = 0.0f; + m_unk0x6c = 0; + m_unk0x70 = 0.0f; + m_unk0x10 = 0; + m_unk0x74 = 0; } diff --git a/LEGO1/legoactor.h b/LEGO1/legoactor.h index 7961ab27..c356f211 100644 --- a/LEGO1/legoactor.h +++ b/LEGO1/legoactor.h @@ -31,10 +31,10 @@ class LegoActor : public LegoEntity { virtual void VTable0x64(undefined p_unk); // vtable+0x64 private: - MxFloat m_unk68; - undefined4 m_unk6c; - MxFloat m_unk70; - undefined m_unk74; + MxFloat m_unk0x68; + undefined4 m_unk0x6c; + MxFloat m_unk0x70; + undefined m_unk0x74; }; #endif // LEGOACTOR_H diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp index 94611218..cc414853 100644 --- a/LEGO1/legoentity.cpp +++ b/LEGO1/legoentity.cpp @@ -25,11 +25,11 @@ void LegoEntity::Init() m_roi = NULL; m_cameraFlag = 0; m_actionArgString = NULL; - m_unk10 = 0; - m_unk11 = 0; + m_unk0x10 = 0; + m_unk0x11 = 0; m_actionType = ExtraActionType_unknown; m_actionArgNumber = -1; - m_unk59 = 4; + m_unk0x59 = 4; } // STUB: LEGO1 0x10010650 diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h index faceb644..c2721a85 100644 --- a/LEGO1/legoentity.h +++ b/LEGO1/legoentity.h @@ -51,15 +51,15 @@ class LegoEntity : public MxEntity { void Init(); void SetWorld(); - undefined m_unk10; - undefined m_unk11; + undefined m_unk0x10; + undefined m_unk0x11; Vector3Data m_worldLocation; // 0x14 Vector3Data m_worldDirection; // 0x28 Vector3Data m_worldUp; // 0x3c MxFloat m_worldSpeed; // 0x50 LegoROI* m_roi; // 0x54 MxBool m_cameraFlag; // 0x58 - undefined m_unk59; + undefined m_unk0x59; // For tokens from the extra string that look like this: // "Action:openram;\lego\scripts\Race\CarRaceR;0" ExtraActionType m_actionType; // 0x5c diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/legoentitypresenter.cpp index 05bcb7bf..6ffea6ad 100644 --- a/LEGO1/legoentitypresenter.cpp +++ b/LEGO1/legoentitypresenter.cpp @@ -14,7 +14,7 @@ LegoEntityPresenter::LegoEntityPresenter() // FUNCTION: LEGO1 0x100535c0 void LegoEntityPresenter::Init() { - m_unk4c = 0; + m_unk0x4c = 0; } // FUNCTION: LEGO1 0x100535d0 @@ -26,7 +26,7 @@ LegoEntityPresenter::~LegoEntityPresenter() // FUNCTION: LEGO1 0x10053630 undefined4 LegoEntityPresenter::vtable6c(undefined4 p_unknown) { - m_unk4c = p_unknown; + m_unk0x4c = p_unknown; return 0; } diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/legoentitypresenter.h index 090c5ea2..1b011e75 100644 --- a/LEGO1/legoentitypresenter.h +++ b/LEGO1/legoentitypresenter.h @@ -30,7 +30,7 @@ class LegoEntityPresenter : public MxCompositePresenter { private: void Destroy(MxBool p_fromDestructor); - undefined4 m_unk4c; + undefined4 m_unk0x4c; }; #endif // LEGOENTITYPRESENTER_H diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/legoeventnotificationparam.h index 30b77a35..5f0195ec 100644 --- a/LEGO1/legoeventnotificationparam.h +++ b/LEGO1/legoeventnotificationparam.h @@ -16,7 +16,7 @@ class LegoEventNotificationParam : public MxNotificationParam { MxS32 p_y, MxU8 p_key ) - : MxNotificationParam(p_type, p_sender), m_modifier(p_modifier), m_x(p_x), m_y(p_y), m_key(p_key), m_unk1c(0) + : MxNotificationParam(p_type, p_sender), m_modifier(p_modifier), m_x(p_x), m_y(p_y), m_key(p_key), m_unk0x1c(0) { } @@ -28,7 +28,7 @@ class LegoEventNotificationParam : public MxNotificationParam { MxS32 m_x; // 0x10 MxS32 m_y; // 0x14 MxU8 m_key; // 0x18 - MxU32 m_unk1c; // 0x1c + MxU32 m_unk0x1c; // 0x1c }; #endif // LEGOEVENTNOTIFICATIONPARAM_H diff --git a/LEGO1/legogamestate.cpp b/LEGO1/legogamestate.cpp index 99e3f47e..05fef225 100644 --- a/LEGO1/legogamestate.cpp +++ b/LEGO1/legogamestate.cpp @@ -94,9 +94,9 @@ MxResult LegoGameState::Save(MxULong p_slot) if (fileStream.Open(savePath.GetData(), LegoStream::WriteBit) != FAILURE) { MxU32 maybeVersion = 0x1000C; fileStream.Write(&maybeVersion, 4); - fileStream.Write(&m_unk24, 2); - fileStream.Write(&m_unk10, 2); - fileStream.Write(&m_unkC, 1); + fileStream.Write(&m_unk0x24, 2); + fileStream.Write(&m_unk0x10, 2); + fileStream.Write(&m_unk0xC, 1); for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) { if (LegoStream::WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE) @@ -264,5 +264,5 @@ void LegoGameState::SerializeScoreHistory(MxS16 p) // FUNCTION: LEGO1 0x1003cea0 void LegoGameState::SetSomeEnumState(undefined4 p_state) { - m_unk10 = p_state; + m_unk0x10 = p_state; } diff --git a/LEGO1/legogamestate.h b/LEGO1/legogamestate.h index 82ff4d9c..f2c78595 100644 --- a/LEGO1/legogamestate.h +++ b/LEGO1/legogamestate.h @@ -34,8 +34,8 @@ class LegoGameState { void FUN_1003a720(MxU32 p_unk); void HandleAction(MxU32 p_unk); - inline MxU32 GetUnknown10() { return m_unk10; } - inline void SetUnknown424(undefined4 p_unk424) { m_unk424 = p_unk424; } + inline MxU32 GetUnknown10() { return m_unk0x10; } + inline void SetUnknown424(undefined4 p_unk424) { m_unk0x424 = p_unk424; } void SetSomeEnumState(undefined4 p_state); @@ -48,17 +48,17 @@ class LegoGameState { char* m_savePath; // 0x0 MxS16 m_stateCount; LegoState** m_stateArray; - MxU8 m_unkC; - MxU32 m_unk10; + MxU8 m_unk0xC; + MxU32 m_unk0x10; undefined4 m_unk0x14; LegoBackgroundColor* m_backgroundColor; // 0x18 LegoBackgroundColor* m_tempBackgroundColor; // 0x1c LegoFullScreenMovie* m_fullScreenMovie; // 0x20 - MxU16 m_unk24; // 0x24 - undefined m_unk28[1020]; - undefined4 m_unk424; - undefined4 m_unk428; - undefined4 m_unk42c; + MxU16 m_unk0x24; // 0x24 + undefined m_unk0x28[1020]; + undefined4 m_unk0x424; + undefined4 m_unk0x428; + undefined4 m_unk0x42c; }; MxBool ROIHandlerFunction(char* p_0, char* p_output, MxU32 p_copyLen); diff --git a/LEGO1/legonavcontroller.cpp b/LEGO1/legonavcontroller.cpp index b4bf4f0f..2c8d97f4 100644 --- a/LEGO1/legonavcontroller.cpp +++ b/LEGO1/legonavcontroller.cpp @@ -42,11 +42,11 @@ LegoNavController::LegoNavController() this->m_movementAccel = 0.0f; this->m_turnAccel = 0.0f; this->m_trackDefault = FALSE; - this->m_unk5D = FALSE; - this->m_unk6C = FALSE; - this->m_unk64 = 0; - this->m_unk68 = 0; - this->m_unk60 = 0; + this->m_unk0x5D = FALSE; + this->m_unk0x6C = FALSE; + this->m_unk0x64 = 0; + this->m_unk0x68 = 0; + this->m_unk0x60 = 0; MxTimer* timer = Timer(); this->m_time = timer->GetTime(); diff --git a/LEGO1/legonavcontroller.h b/LEGO1/legonavcontroller.h index 7306e0f7..5647fb5d 100644 --- a/LEGO1/legonavcontroller.h +++ b/LEGO1/legonavcontroller.h @@ -82,12 +82,12 @@ class LegoNavController : public MxCore { MxBool m_turnUseVelocity; int m_time; MxBool m_trackDefault; - MxBool m_unk5D; - char m_unk5E[2]; - int m_unk60; - int m_unk64; - int m_unk68; - MxBool m_unk6C; + MxBool m_unk0x5D; + char m_unk0x5E[2]; + int m_unk0x60; + int m_unk0x64; + int m_unk0x68; + MxBool m_unk0x6C; }; #endif // LEGONAVCONTROLLER_H diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index c4069080..d36bb6a3 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -355,21 +355,21 @@ LegoOmni::~LegoOmni() void LegoOmni::Init() { MxOmni::Init(); - m_unk68 = 0; + m_unk0x68 = 0; m_inputMgr = NULL; - m_unk6c = 0; + m_unk0x6c = 0; m_gifManager = NULL; m_worldList = NULL; m_currentWorld = NULL; - m_unk80 = FALSE; + m_unk0x80 = FALSE; m_currentVehicle = NULL; - m_unkLegoSaveDataWriter = NULL; + m_unk0xLegoSaveDataWriter = NULL; m_plantManager = NULL; m_gameState = NULL; m_animationManager = NULL; m_buildingManager = NULL; m_bkgAudioManager = NULL; - m_unk13c = TRUE; + m_unk0x13c = TRUE; m_transitionManager = NULL; } @@ -430,7 +430,7 @@ MxResult LegoOmni::Create(MxOmniCreateParam& p) m_gameState = new LegoGameState(); m_worldList = new LegoWorldList(); - if (m_unk6c && m_gifManager && m_worldList && m_plantManager && m_animationManager && m_buildingManager) { + if (m_unk0x6c && m_gifManager && m_worldList && m_plantManager && m_animationManager && m_buildingManager) { // TODO: initialize a bunch of MxVariables RegisterScripts(); FUN_1001a700(); diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h index 4a4ca87a..ec4e3fe8 100644 --- a/LEGO1/legoomni.h +++ b/LEGO1/legoomni.h @@ -114,16 +114,16 @@ class LegoOmni : public MxOmni { MxDSAction& GetCurrentAction() { return m_action; } private: - undefined4 m_unk68; - undefined4 m_unk6c; + undefined4 m_unk0x68; + undefined4 m_unk0x6c; LegoInputManager* m_inputMgr; // 0x70 GifManager* m_gifManager; LegoWorldList* m_worldList; // 0x78 LegoWorld* m_currentWorld; - MxBool m_unk80; + MxBool m_unk0x80; LegoNavController* m_navController; // 0x84 LegoWorld* m_currentVehicle; // 0x88 - LegoUnkSaveDataWriter* m_unkLegoSaveDataWriter; + LegoUnkSaveDataWriter* m_unk0xLegoSaveDataWriter; LegoPlantManager* m_plantManager; // 0x90 LegoAnimationManager* m_animationManager; LegoBuildingManager* m_buildingManager; // 0x98 @@ -131,7 +131,7 @@ class LegoOmni : public MxOmni { MxDSAction m_action; MxBackgroundAudioManager* m_bkgAudioManager; // 0x134 MxTransitionManager* m_transitionManager; // 0x138 - MxBool m_unk13c; + MxBool m_unk0x13c; }; __declspec(dllexport) MxBackgroundAudioManager* BackgroundAudioManager(); diff --git a/LEGO1/legopathactor.h b/LEGO1/legopathactor.h index 66f649fa..5d324833 100644 --- a/LEGO1/legopathactor.h +++ b/LEGO1/legopathactor.h @@ -54,12 +54,12 @@ class LegoPathActor : public LegoActor { protected: // TODO: the types undefined unk78[0xc4]; - MxFloat m_unk13c; - MxS32 m_unk140; - MxS32 m_unk144; - undefined m_unk148; - MxS32 m_unk14c; - MxFloat m_unk150; + MxFloat m_unk0x13c; + MxS32 m_unk0x140; + MxS32 m_unk0x144; + undefined m_unk0x148; + MxS32 m_unk0x14c; + MxFloat m_unk0x150; }; #endif // LEGOPATHACTOR_H diff --git a/LEGO1/legophonemepresenter.cpp b/LEGO1/legophonemepresenter.cpp index f96d3760..31948367 100644 --- a/LEGO1/legophonemepresenter.cpp +++ b/LEGO1/legophonemepresenter.cpp @@ -16,8 +16,8 @@ LegoPhonemePresenter::~LegoPhonemePresenter() // FUNCTION: LEGO1 0x1004e3b0 void LegoPhonemePresenter::Init() { - m_unk68 = 0; - m_unk6c = 0; - m_unk70 = 0; - m_unk84 = 0; + m_unk0x68 = 0; + m_unk0x6c = 0; + m_unk0x70 = 0; + m_unk0x84 = 0; } diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/legophonemepresenter.h index 00fa6dde..7b620723 100644 --- a/LEGO1/legophonemepresenter.h +++ b/LEGO1/legophonemepresenter.h @@ -22,11 +22,11 @@ class LegoPhonemePresenter : public MxFlcPresenter { private: void Init(); - int m_unk68; - int m_unk6c; - undefined m_unk70; + int m_unk0x68; + int m_unk0x6c; + undefined m_unk0x70; MxString m_string; // 0x74 - undefined m_unk84; + undefined m_unk0x84; }; #endif // LEGOPHONEMEPRESENTER_H diff --git a/LEGO1/legorace.cpp b/LEGO1/legorace.cpp index 0067495b..d5eefbd5 100644 --- a/LEGO1/legorace.cpp +++ b/LEGO1/legorace.cpp @@ -25,21 +25,21 @@ MxBool LegoRace::VTable0x5c() // FUNCTION: LEGO1 0x10015aa0 LegoRace::LegoRace() { - this->m_unkf8 = 0; - this->m_unkfc = 0; - this->m_unk100 = 0; - this->m_unk104 = 0; - this->m_unk108 = 0; - this->m_unk10c = 0; - this->m_unk140 = 0; - this->m_unk110 = 0; - this->m_unk114 = 0; - this->m_unk118 = 0; - this->m_unk128 = 0; - this->m_unk12c = 0; - this->m_unk120 = 0; - this->m_unk124 = 0; - this->m_unk11c = 0; + this->m_unk0xf8 = 0; + this->m_unk0xfc = 0; + this->m_unk0x100 = 0; + this->m_unk0x104 = 0; + this->m_unk0x108 = 0; + this->m_unk0x10c = 0; + this->m_unk0x140 = 0; + this->m_unk0x110 = 0; + this->m_unk0x114 = 0; + this->m_unk0x118 = 0; + this->m_unk0x128 = 0; + this->m_unk0x12c = 0; + this->m_unk0x120 = 0; + this->m_unk0x124 = 0; + this->m_unk0x11c = 0; NotificationManager()->Register(this); } diff --git a/LEGO1/legorace.h b/LEGO1/legorace.h index feee5efb..8ae52d8e 100644 --- a/LEGO1/legorace.h +++ b/LEGO1/legorace.h @@ -38,22 +38,22 @@ class LegoRace : public LegoWorld { virtual void VTable0x7c(undefined4, undefined4); // vtable+0x7c private: - undefined4 m_unkf8; // 0xf8 - undefined4 m_unkfc; // 0xfc - undefined4 m_unk100; // 0x100 - undefined4 m_unk104; // 0x104 - undefined4 m_unk108; // 0x108 - undefined4 m_unk10c; // 0x10c - undefined4 m_unk110; // 0x110 - undefined4 m_unk114; // 0x114 - undefined4 m_unk118; // 0x118 - undefined4 m_unk11c; // 0x11c - undefined4 m_unk120; // 0x120 - this may be the current vehcle (function at 0x10015880) - undefined4 m_unk124; // 0x124 - something game state - undefined4 m_unk128; // 0x128 - undefined4 m_unk12c; // 0x12c - undefined4 m_unk130[4]; // unconfirmed bytes, ghidra claims these are integers - undefined4 m_unk140; + undefined4 m_unk0xf8; // 0xf8 + undefined4 m_unk0xfc; // 0xfc + undefined4 m_unk0x100; // 0x100 + undefined4 m_unk0x104; // 0x104 + undefined4 m_unk0x108; // 0x108 + undefined4 m_unk0x10c; // 0x10c + undefined4 m_unk0x110; // 0x110 + undefined4 m_unk0x114; // 0x114 + undefined4 m_unk0x118; // 0x118 + undefined4 m_unk0x11c; // 0x11c + undefined4 m_unk0x120; // 0x120 - this may be the current vehcle (function at 0x10015880) + undefined4 m_unk0x124; // 0x124 - something game state + undefined4 m_unk0x128; // 0x128 + undefined4 m_unk0x12c; // 0x12c + undefined4 m_unk0x130[4]; // unconfirmed bytes, ghidra claims these are integers + undefined4 m_unk0x140; }; #endif // LEGORACE_H diff --git a/LEGO1/legoroi.cpp b/LEGO1/legoroi.cpp index 70cb1faf..b5ec6536 100644 --- a/LEGO1/legoroi.cpp +++ b/LEGO1/legoroi.cpp @@ -8,7 +8,7 @@ typedef struct { MxS32 m_red; MxS32 m_green; MxS32 m_blue; - MxS32 m_unk10; + MxS32 m_unk0x10; } ROIColorAlias; // GLOBAL: LEGO1 0x100dbe28 @@ -74,7 +74,7 @@ MxBool LegoROI::ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green p_red = g_roiColorAliases[i].m_red * g_normalizeByteToFloat; p_green = g_roiColorAliases[i].m_green * g_normalizeByteToFloat; p_blue = g_roiColorAliases[i].m_blue * g_normalizeByteToFloat; - p_other = g_roiColorAliases[i].m_unk10 * g_normalizeByteToFloat; + p_other = g_roiColorAliases[i].m_unk0x10 * g_normalizeByteToFloat; return TRUE; } i++; diff --git a/LEGO1/legovehiclebuildstate.cpp b/LEGO1/legovehiclebuildstate.cpp index f662293a..b0dccde2 100644 --- a/LEGO1/legovehiclebuildstate.cpp +++ b/LEGO1/legovehiclebuildstate.cpp @@ -8,18 +8,18 @@ DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0xc); // FUNCTION: LEGO1 0x10017c00 LegoVehicleBuildState::UnkStruct::UnkStruct() { - m_unk04 = 0; - m_unk00 = 0; - m_unk06 = 0; - m_unk08 = 0; + m_unk0x04 = 0; + m_unk0x00 = 0; + m_unk0x06 = 0; + m_unk0x08 = 0; } // FUNCTION: LEGO1 0x10025f30 LegoVehicleBuildState::LegoVehicleBuildState(char* p_classType) { this->m_className = p_classType; - this->m_unk4c = 0; - this->m_unk4d = 0; - this->m_unk4e = 0; + this->m_unk0x4c = 0; + this->m_unk0x4d = 0; + this->m_unk0x4e = 0; this->m_placedPartCount = 0; } diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/legovehiclebuildstate.h index ae59d1f5..a39740bb 100644 --- a/LEGO1/legovehiclebuildstate.h +++ b/LEGO1/legovehiclebuildstate.h @@ -25,16 +25,16 @@ class LegoVehicleBuildState : public LegoState { public: struct UnkStruct { - undefined4 m_unk00; - undefined2 m_unk04; - undefined2 m_unk06; - undefined2 m_unk08; + undefined4 m_unk0x00; + undefined2 m_unk0x04; + undefined2 m_unk0x06; + undefined2 m_unk0x08; UnkStruct(); }; private: - UnkStruct m_unk08[4]; // 0x08 + UnkStruct m_unk0x08[4]; // 0x08 // This can be one of the following: // * LegoRaceCarBuildState @@ -48,9 +48,9 @@ class LegoVehicleBuildState : public LegoState { // * 3 == cutscene/dialogue // * 6 == exit(ing) build screen MxU32 m_animationState; // 0x48 - undefined m_unk4c; // 0x4c - undefined m_unk4d; // 0x4d - undefined m_unk4e; // 0x4e + undefined m_unk0x4c; // 0x4c + undefined m_unk0x4d; // 0x4d + undefined m_unk0x4e; // 0x4e MxU8 m_placedPartCount; // 0x4f }; diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/legovideomanager.cpp index 0ec7ec07..c87c4140 100644 --- a/LEGO1/legovideomanager.cpp +++ b/LEGO1/legovideomanager.cpp @@ -5,14 +5,14 @@ DECOMP_SIZE_ASSERT(LegoVideoManager, 0x590); // FUNCTION: LEGO1 0x1007aa20 LegoVideoManager::LegoVideoManager() { - m_unk64 = 0; + m_unk0x64 = 0; m_3dManager = NULL; - m_unk6c = 0; + m_unk0x6c = 0; m_direct3d = 0; m_unk0xe6 = FALSE; memset(m_unk0x78, 0, sizeof(m_unk0x78)); m_unk0x78[0] = 0x6c; - m_unk4e8 = 0; + m_unk0x4e8 = 0; m_isFullscreenMovie = FALSE; m_palette = NULL; m_prefCounter = NULL; @@ -47,11 +47,11 @@ void LegoVideoManager::Destroy() m_arialFont = NULL; } - // delete m_unk64; //TODO: delete d3drm + // delete m_unk0x64; //TODO: delete d3drm delete m_3dManager; MxVideoManager::Destroy(); - // todo: delete m_unk4e8 + // todo: delete m_unk0x4e8 delete[] m_prefCounter; } diff --git a/LEGO1/legovideomanager.h b/LEGO1/legovideomanager.h index 060e9f10..ee9704e0 100644 --- a/LEGO1/legovideomanager.h +++ b/LEGO1/legovideomanager.h @@ -36,10 +36,10 @@ class LegoVideoManager : public MxVideoManager { virtual void Destroy() override; // vtable+0x18 private: - undefined4 m_unk64; + undefined4 m_unk0x64; Lego3DManager* m_3dManager; // 0x68 - undefined4 m_unk6c; - undefined4 m_unk70; + undefined4 m_unk0x6c; + undefined4 m_unk0x70; MxDirect3D* m_direct3d; // 0x74 undefined4 m_unk0x78[27]; MxBool m_unk0xe4; @@ -47,7 +47,7 @@ class LegoVideoManager : public MxVideoManager { MxBool m_unk0xe6; PALETTEENTRY m_paletteEntries[256]; // 0xe7 undefined m_padding0x4e7; - undefined4 m_unk4e8; + undefined4 m_unk0x4e8; MxBool m_isFullscreenMovie; // 0x4ec MxPalette* m_palette; // 0x4f0 LARGE_INTEGER* m_prefCounter; // 0x4f4 diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h index 2efb6150..f363ec4d 100644 --- a/LEGO1/legoworld.h +++ b/LEGO1/legoworld.h @@ -44,11 +44,11 @@ class LegoWorld : public LegoEntity { LegoPathControllerList m_list0x68; // 0x68 MxPresenterList m_list0x80; // 0x80 LegoCameraController* m_camera; // 0x98 - undefined m_unk9c[0x1c]; + undefined m_unk0x9c[0x1c]; MxPresenterList m_list0xb8; // 0xb8 - undefined m_unkd0[0x26]; - undefined m_unkf6; - undefined m_unkf7; + undefined m_unk0xd0[0x26]; + undefined m_unk0xf6; + undefined m_unk0xf7; }; void FUN_10015820(MxU32 p_unk1, MxU32 p_unk2); diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/legoworldpresenter.cpp index 0a6f0c21..16c91664 100644 --- a/LEGO1/legoworldpresenter.cpp +++ b/LEGO1/legoworldpresenter.cpp @@ -12,7 +12,7 @@ void LegoWorldPresenter::configureLegoWorldPresenter(int p_quality) // FUNCTION: LEGO1 0x100665c0 LegoWorldPresenter::LegoWorldPresenter() { - m_unk50 = 50000; + m_unk0x50 = 50000; } // STUB: LEGO1 0x10066770 diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/legoworldpresenter.h index 9d8c551a..e0ef39d9 100644 --- a/LEGO1/legoworldpresenter.h +++ b/LEGO1/legoworldpresenter.h @@ -26,7 +26,7 @@ class LegoWorldPresenter : public LegoEntityPresenter { } private: - undefined4 m_unk50; + undefined4 m_unk0x50; }; #endif // LEGOWORLDPRESENTER_H diff --git a/LEGO1/motorcycle.cpp b/LEGO1/motorcycle.cpp index 34a05a46..18fabd8a 100644 --- a/LEGO1/motorcycle.cpp +++ b/LEGO1/motorcycle.cpp @@ -5,8 +5,8 @@ DECOMP_SIZE_ASSERT(Motorcycle, 0x16c); // FUNCTION: LEGO1 0x100357b0 Motorcycle::Motorcycle() { - this->m_unk13c = 40.0; - this->m_unk150 = 1.75; - this->m_unk148 = 1; - this->m_unk164 = 1.0; + this->m_unk0x13c = 40.0; + this->m_unk0x150 = 1.75; + this->m_unk0x148 = 1; + this->m_unk0x164 = 1.0; } diff --git a/LEGO1/motorcycle.h b/LEGO1/motorcycle.h index e3afe584..3b847873 100644 --- a/LEGO1/motorcycle.h +++ b/LEGO1/motorcycle.h @@ -24,9 +24,9 @@ class Motorcycle : public IslePathActor { } private: - undefined m_unk160[4]; - MxFloat m_unk164; - undefined m_unk168[4]; + undefined m_unk0x160[4]; + MxFloat m_unk0x164; + undefined m_unk0x168[4]; }; #endif // MOTORCYCLE_H diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/mxbackgroundaudiomanager.cpp index 572bcca7..f16a89b8 100644 --- a/LEGO1/mxbackgroundaudiomanager.cpp +++ b/LEGO1/mxbackgroundaudiomanager.cpp @@ -14,12 +14,12 @@ DECOMP_SIZE_ASSERT(MxBackgroundAudioManager, 0x150) MxBackgroundAudioManager::MxBackgroundAudioManager() { NotificationManager()->Register(this); - m_unka0 = 0; - m_unk138 = 0; - m_unk13c = 0; - m_unk140 = 0; + m_unk0xa0 = 0; + m_unk0x138 = 0; + m_unk0x13c = 0; + m_unk0x140 = 0; m_targetVolume = 0; - m_unk148 = 0; + m_unk0x148 = 0; m_musicEnabled = FALSE; } @@ -76,7 +76,7 @@ void MxBackgroundAudioManager::DestroyMusic() // FUNCTION: LEGO1 0x1007ee40 MxResult MxBackgroundAudioManager::Tickle() { - switch (m_unk13c) { + switch (m_unk0x13c) { case MxPresenter::TickleState_Starting: FadeInOrFadeOut(); return SUCCESS; @@ -94,17 +94,17 @@ MxResult MxBackgroundAudioManager::Tickle() // FUNCTION: LEGO1 0x1007ee70 void MxBackgroundAudioManager::FUN_1007ee70() { - if (m_unka0 && m_unka0->GetAction()) { - DeleteObject(*m_unk138->GetAction()); + if (m_unk0xa0 && m_unk0xa0->GetAction()) { + DeleteObject(*m_unk0x138->GetAction()); } - if (m_unk138) { - m_unka0 = m_unk138; + if (m_unk0x138) { + m_unk0xa0 = m_unk0x138; m_action1 = m_action2; - m_unk138 = NULL; + m_unk0x138 = NULL; m_action2.SetObjectId(-1); m_action2.SetAtomId(MxAtomId()); - m_unk13c = NULL; + m_unk0x13c = NULL; } } @@ -113,41 +113,41 @@ void MxBackgroundAudioManager::FUN_1007ef40() { MxU32 compare; MxU32 volume; - if (m_unka0 == NULL) { - if (m_unk138) { + if (m_unk0xa0 == NULL) { + if (m_unk0x138) { compare = 30; - if (m_unk148 == 0) { - compare = m_unk148; + if (m_unk0x148 == 0) { + compare = m_unk0x148; } - volume = m_unk138->GetVolume(); + volume = m_unk0x138->GetVolume(); if (volume < compare) { - if (m_unk140 + m_unk138->GetVolume() <= compare) { - compare = m_unk140 + compare; + if (m_unk0x140 + m_unk0x138->GetVolume() <= compare) { + compare = m_unk0x140 + compare; } - m_unk138->SetVolume(compare); + m_unk0x138->SetVolume(compare); } else { - m_unk138->SetVolume(compare); - m_unka0 = m_unk138; + m_unk0x138->SetVolume(compare); + m_unk0xa0 = m_unk0x138; m_action1 = m_action2; - m_unk138 = NULL; + m_unk0x138 = NULL; m_action2.SetObjectId(-1); m_action2.SetAtomId(MxAtomId()); - m_unk13c = NULL; + m_unk0x13c = NULL; } } } - else if (m_unka0->GetAction() != NULL) { - if (m_unka0->GetVolume() == 0) { - DeleteObject(*m_unka0->GetAction()); + else if (m_unk0xa0->GetAction() != NULL) { + if (m_unk0xa0->GetVolume() == 0) { + DeleteObject(*m_unk0xa0->GetAction()); } else { - compare = m_unka0->GetVolume(); + compare = m_unk0xa0->GetVolume(); volume = 0; - if (compare != m_unk140 && -1 < compare - m_unk140) { - volume = m_unka0->GetVolume() - m_unk140; + if (compare != m_unk0x140 && -1 < compare - m_unk0x140) { + volume = m_unk0xa0->GetVolume() - m_unk0x140; } - m_unk138->SetVolume(volume); + m_unk0x138->SetVolume(volume); } } } @@ -156,34 +156,34 @@ void MxBackgroundAudioManager::FUN_1007ef40() void MxBackgroundAudioManager::FadeInOrFadeOut() { // This function probably is the fade in/out routine - if (m_unka0 != NULL) { - undefined4 volume = m_unka0->GetVolume(); + if (m_unk0xa0 != NULL) { + undefined4 volume = m_unk0xa0->GetVolume(); MxU32 compare = 30; - if (m_unk148 == 0) { + if (m_unk0x148 == 0) { compare = m_targetVolume; } if (volume < compare) { - volume = m_unk140 + volume; + volume = m_unk0x140 + volume; if (compare <= volume) { volume = compare; } - m_unka0->SetVolume(volume); + m_unk0xa0->SetVolume(volume); } else if (compare < volume) { - volume = volume - m_unk140; + volume = volume - m_unk0x140; if (volume <= compare) { volume = compare; } - m_unka0->SetVolume(volume); + m_unk0xa0->SetVolume(volume); } else { - m_unka0->SetVolume(volume); - m_unk13c = 0; + m_unk0xa0->SetVolume(volume); + m_unk0x13c = 0; } } else { - m_unk13c = 0; + m_unk0x13c = 0; } } @@ -205,23 +205,23 @@ MxLong MxBackgroundAudioManager::Notify(MxParam& p_param) void MxBackgroundAudioManager::StartAction(MxParam& p_param) { // TODO: the sender is most likely a MxAudioPresenter? - m_unk138 = (MxAudioPresenter*) ((MxNotificationParam&) p_param).GetSender(); - m_action2.SetAtomId(m_unk138->GetAction()->GetAtomId()); - m_action2.SetObjectId(m_unk138->GetAction()->GetObjectId()); - m_targetVolume = ((MxDSSound*) (m_unk138->GetAction()))->GetVolume(); - m_unk138->SetVolume(0); + m_unk0x138 = (MxAudioPresenter*) ((MxNotificationParam&) p_param).GetSender(); + m_action2.SetAtomId(m_unk0x138->GetAction()->GetAtomId()); + m_action2.SetObjectId(m_unk0x138->GetAction()->GetObjectId()); + m_targetVolume = ((MxDSSound*) (m_unk0x138->GetAction()))->GetVolume(); + m_unk0x138->SetVolume(0); } // FUNCTION: LEGO1 0x1007f200 void MxBackgroundAudioManager::StopAction(MxParam& p_param) { - if (((MxNotificationParam&) p_param).GetSender() == m_unka0) { - m_unka0 = NULL; + if (((MxNotificationParam&) p_param).GetSender() == m_unk0xa0) { + m_unk0xa0 = NULL; m_action1.SetAtomId(MxAtomId()); m_action1.SetObjectId(-1); } - else if (((MxNotificationParam&) p_param).GetSender() == m_unk138) { - m_unk138 = NULL; + else if (((MxNotificationParam&) p_param).GetSender() == m_unk0x138) { + m_unk0x138 = NULL; m_action2.SetAtomId(MxAtomId()); m_action2.SetObjectId(-1); } @@ -253,8 +253,8 @@ MxResult MxBackgroundAudioManager::PlayMusic(MxDSAction& p_action, undefined4 p_ GetCurrentAction().SetUnknown24(action.GetUnknown24()); if (result == SUCCESS) { - m_unk13c = p_unknown2; - m_unk140 = p_unknown; + m_unk0x13c = p_unknown2; + m_unk0x140 = p_unknown; } return result; } @@ -267,42 +267,42 @@ void MxBackgroundAudioManager::Stop() if (m_action2.GetObjectId() != -1) DeleteObject(m_action2); - m_unk138 = 0; + m_unk0x138 = 0; m_action2.SetAtomId(MxAtomId()); m_action2.SetObjectId(-1); if (m_action1.GetObjectId() != -1) DeleteObject(m_action1); - m_unka0 = 0; + m_unk0xa0 = 0; m_action1.SetAtomId(MxAtomId()); - m_unk148 = 0; + m_unk0x148 = 0; m_action1.SetObjectId(-1); - m_unk13c = 0; + m_unk0x13c = 0; } // FUNCTION: LEGO1 0x1007f570 void MxBackgroundAudioManager::LowerVolume() { - if (m_unk148 == 0) { - if (m_unk13c == 0) { - m_unk13c = 2; + if (m_unk0x148 == 0) { + if (m_unk0x13c == 0) { + m_unk0x13c = 2; } - m_unk140 = 20; + m_unk0x140 = 20; } - m_unk148++; + m_unk0x148++; } // FUNCTION: LEGO1 0x1007f5b0 void MxBackgroundAudioManager::RaiseVolume() { - if (m_unk148 != 0) { - m_unk148--; - if (m_unk148 == 0) { - if (m_unk13c == 0) { - m_unk13c = 2; + if (m_unk0x148 != 0) { + m_unk0x148--; + if (m_unk0x148 == 0) { + if (m_unk0x13c == 0) { + m_unk0x13c = 2; } - m_unk140 = 10; + m_unk0x140 = 10; } } } @@ -321,6 +321,6 @@ void MxBackgroundAudioManager::Enable(MxBool p) // FUNCTION: LEGO1 0x1007f650 void MxBackgroundAudioManager::Init() { - this->m_unka0 = 0; - this->m_unk13c = 0; + this->m_unk0xa0 = 0; + this->m_unk0x13c = 0; } diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/mxbackgroundaudiomanager.h index f1029b3a..f22b9d66 100644 --- a/LEGO1/mxbackgroundaudiomanager.h +++ b/LEGO1/mxbackgroundaudiomanager.h @@ -53,13 +53,13 @@ class MxBackgroundAudioManager : public MxCore { MxBool m_musicEnabled; // 0x8 MxDSAction m_action1; // 0xc - MxAudioPresenter* m_unka0; + MxAudioPresenter* m_unk0xa0; MxDSAction m_action2; // 0xa4 - MxAudioPresenter* m_unk138; - MxS32 m_unk13c; - MxS32 m_unk140; + MxAudioPresenter* m_unk0x138; + MxS32 m_unk0x13c; + MxS32 m_unk0x140; MxS32 m_targetVolume; - MxS16 m_unk148; + MxS16 m_unk0x148; MxAtomId m_script; }; diff --git a/LEGO1/mxcontrolpresenter.cpp b/LEGO1/mxcontrolpresenter.cpp index a3ffc3d6..07802a08 100644 --- a/LEGO1/mxcontrolpresenter.cpp +++ b/LEGO1/mxcontrolpresenter.cpp @@ -8,19 +8,19 @@ DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c) // FUNCTION: LEGO1 0x10043f50 MxControlPresenter::MxControlPresenter() { - this->m_unk4c = 0; - this->m_unk4e = -1; - this->m_unk50 = 0; - this->m_unk52 = 0; - this->m_unk58 = 0; - this->m_unk54 = 0; + this->m_unk0x4c = 0; + this->m_unk0x4e = -1; + this->m_unk0x50 = 0; + this->m_unk0x52 = 0; + this->m_unk0x58 = 0; + this->m_unk0x54 = 0; } // FUNCTION: LEGO1 0x10044110 MxControlPresenter::~MxControlPresenter() { - if (this->m_unk58) { - delete this->m_unk58; + if (this->m_unk0x58) { + delete this->m_unk0x58; } } diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/mxcontrolpresenter.h index 5d2cfb11..dfe104bf 100644 --- a/LEGO1/mxcontrolpresenter.h +++ b/LEGO1/mxcontrolpresenter.h @@ -27,12 +27,12 @@ class MxControlPresenter : public MxCompositePresenter { virtual void ReadyTickle() override; // vtable+0x18 private: - undefined2 m_unk4c; - MxS16 m_unk4e; - undefined m_unk50; - undefined2 m_unk52; - undefined2 m_unk54; - undefined4* m_unk58; + undefined2 m_unk0x4c; + MxS16 m_unk0x4e; + undefined m_unk0x50; + undefined2 m_unk0x52; + undefined2 m_unk0x54; + undefined4* m_unk0x58; }; #endif // MXCONTROLPRESENTER_H diff --git a/LEGO1/mxdirect3d.cpp b/LEGO1/mxdirect3d.cpp index 64c39984..27db99d1 100644 --- a/LEGO1/mxdirect3d.cpp +++ b/LEGO1/mxdirect3d.cpp @@ -11,7 +11,7 @@ MxDirect3D::MxDirect3D() { this->m_pDirect3d = NULL; this->m_pDirect3dDevice = NULL; - this->m_unk88c = NULL; + this->m_unk0x88c = NULL; this->m_pDeviceModeFinder = NULL; } @@ -167,7 +167,7 @@ void MxDirect3D::BuildErrorString(const char* p_format, ...) MxResult MxDeviceEnumerate::_DoEnumerate() { // TODO: what does ECX refer to in this context? - if (m_unk010_flag) + if (m_unk0x010_flag) return FAILURE; HRESULT ret = DirectDrawEnumerate(EnumerateCallback, this); @@ -176,7 +176,7 @@ MxResult MxDeviceEnumerate::_DoEnumerate() return FAILURE; } - m_unk010_flag = TRUE; + m_unk0x010_flag = TRUE; return SUCCESS; } diff --git a/LEGO1/mxdirect3d.h b/LEGO1/mxdirect3d.h index f038ee7f..61952beb 100644 --- a/LEGO1/mxdirect3d.h +++ b/LEGO1/mxdirect3d.h @@ -13,7 +13,7 @@ class MxDeviceModeFinder { MxDeviceModeFinder(); ~MxDeviceModeFinder(); - undefined4 m_unknown[56]; + undefined4 m_unk0xnown[56]; MxDirectDraw::DeviceModesInfo* m_deviceInfo; // +0xe0 }; @@ -28,12 +28,12 @@ class MxDeviceEnumerate { const char* EnumerateErrorToString(HRESULT p_error); - undefined4 m_unk004; - undefined4 m_unk008; - undefined4 m_unk00c; - MxBool m_unk010_flag; // +0x10 + undefined4 m_unk0x004; + undefined4 m_unk0x008; + undefined4 m_unk0x00c; + MxBool m_unk0x010_flag; // +0x10 - undefined4 m_unknown[97]; + undefined4 m_unk0xnown[97]; }; // VTABLE: LEGO1 0x100db800 @@ -68,8 +68,8 @@ class MxDirect3D : public MxDirectDraw { MxDeviceModeFinder* m_pDeviceModeFinder; // +0x880 IDirect3D* m_pDirect3d; // +0x884 IDirect3DDevice* m_pDirect3dDevice; - undefined4 m_unk88c; - undefined4 m_unk890; + undefined4 m_unk0x88c; + undefined4 m_unk0x890; }; BOOL FAR PASCAL EnumerateCallback(GUID FAR*, LPSTR, LPSTR, LPVOID); diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp index 70fdecaa..c079f21b 100644 --- a/LEGO1/mxdiskstreamcontroller.cpp +++ b/LEGO1/mxdiskstreamcontroller.cpp @@ -10,7 +10,7 @@ DECOMP_SIZE_ASSERT(MxDiskStreamController, 0xc8); // FUNCTION: LEGO1 0x100c7120 MxDiskStreamController::MxDiskStreamController() { - m_unk8c = 0; + m_unk0x8c = 0; } // TEMPLATE: LEGO1 0x100c7330 diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h index 1cc8ca08..8709c23d 100644 --- a/LEGO1/mxdiskstreamcontroller.h +++ b/LEGO1/mxdiskstreamcontroller.h @@ -40,14 +40,14 @@ class MxDiskStreamController : public MxStreamController { private: MxStreamListMxDSAction m_list0x64; // 0x64 - undefined m_unk70; // 0x70 + undefined m_unk0x70; // 0x70 list m_list0x74; // 0x74 MxStreamListMxDSAction m_list0x80; // 0x80 - undefined2 m_unk8c; // 0x8c + undefined2 m_unk0x8c; // 0x8c MxStreamListMxDSAction m_list0x90; // 0x90 MxCriticalSection m_critical9c; // 0x9c MxStreamListMxDSAction m_list0xb8; // 0xb8 - undefined m_unkc4; // 0xc4 + undefined m_unk0xc4; // 0xc4 }; #endif // MXDISKSTREAMCONTROLLER_H diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/mxdiskstreamprovider.cpp index 614aab48..f635b82a 100644 --- a/LEGO1/mxdiskstreamprovider.cpp +++ b/LEGO1/mxdiskstreamprovider.cpp @@ -29,7 +29,7 @@ MxDiskStreamProvider::MxDiskStreamProvider() { this->m_pFile = NULL; this->m_remainingWork = 0; - this->m_unk35 = 0; + this->m_unk0x35 = 0; } // STUB: LEGO1 0x100d1240 @@ -81,7 +81,7 @@ MxResult MxDiskStreamProvider::WaitForWorkToComplete() { while (m_remainingWork != 0) { m_busySemaphore.Wait(INFINITE); - if (m_unk35 != 0) + if (m_unk0x35 != 0) PerformWork(); } return SUCCESS; diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/mxdiskstreamprovider.h index f138488d..11b1d3c8 100644 --- a/LEGO1/mxdiskstreamprovider.h +++ b/LEGO1/mxdiskstreamprovider.h @@ -57,7 +57,7 @@ class MxDiskStreamProvider : public MxStreamProvider { MxDiskStreamProviderThread m_thread; // 0x10 MxSemaphore m_busySemaphore; // 0x2c undefined m_remainingWork; // 0x34 - undefined m_unk35; // 0x35 + undefined m_unk0x35; // 0x35 MxCriticalSection m_criticalSection; // 0x38 MxStreamListMxDSAction m_list; // 0x54 }; diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/mxdsaction.cpp index a01bceff..12679f73 100644 --- a/LEGO1/mxdsaction.cpp +++ b/LEGO1/mxdsaction.cpp @@ -26,10 +26,10 @@ MxDSAction::MxDSAction() this->m_location.Fill(FLT_MAX); this->m_direction.Fill(FLT_MAX); this->m_up.Fill(FLT_MAX); - this->m_unk84 = NULL; - this->m_unk88 = 0; + this->m_unk0x84 = NULL; + this->m_unk0x88 = 0; this->m_origin = NULL; - this->m_unkTimingField = INT_MIN; + this->m_unk0xTimingField = INT_MIN; } // FUNCTION: LEGO1 0x100ad940 @@ -53,13 +53,13 @@ MxBool MxDSAction::HasId(MxU32 p_objectId) // FUNCTION: LEGO1 0x100ada40 void MxDSAction::SetUnkTimingField(MxLong p_unkTimingField) { - this->m_unkTimingField = p_unkTimingField; + this->m_unk0xTimingField = p_unkTimingField; } // FUNCTION: LEGO1 0x100ada50 MxLong MxDSAction::GetUnkTimingField() { - return this->m_unkTimingField; + return this->m_unk0xTimingField; } // FUNCTION: LEGO1 0x100ada80 @@ -82,10 +82,10 @@ void MxDSAction::CopyFrom(MxDSAction& p_dsAction) this->m_up.CopyFrom(p_dsAction.m_up); AppendData(p_dsAction.m_extraLength, p_dsAction.m_extraData); - this->m_unk84 = p_dsAction.m_unk84; - this->m_unk88 = p_dsAction.m_unk88; + this->m_unk0x84 = p_dsAction.m_unk0x84; + this->m_unk0x88 = p_dsAction.m_unk0x88; this->m_origin = p_dsAction.m_origin; - this->m_unkTimingField = p_dsAction.m_unkTimingField; + this->m_unk0xTimingField = p_dsAction.m_unk0xTimingField; } // FUNCTION: LEGO1 0x100adbe0 @@ -124,7 +124,7 @@ MxDSAction* MxDSAction::Clone() // FUNCTION: LEGO1 0x100adcd0 MxLong MxDSAction::GetElapsedTime() { - return Timer()->GetTime() - this->m_unkTimingField; + return Timer()->GetTime() - this->m_unk0xTimingField; } // FUNCTION: LEGO1 0x100add00 diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h index 268e4e14..58a2184d 100644 --- a/LEGO1/mxdsaction.h +++ b/LEGO1/mxdsaction.h @@ -63,7 +63,7 @@ class MxDSAction : public MxDSObject { inline MxS32 GetLoopCount() { return m_loopCount; } inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; } inline const Vector3Data& GetLocation() const { return m_location; } - inline void SetUnknown84(MxCore* p_unk84) { m_unk84 = p_unk84; } + inline void SetUnknown84(MxCore* p_unk84) { m_unk0x84 = p_unk84; } inline MxCore* GetOrigin() { return m_origin; } inline void SetOrigin(MxCore* p_origin) { m_origin = p_origin; } @@ -79,20 +79,20 @@ class MxDSAction : public MxDSObject { } protected: - MxU32 m_sizeOnDisk; // 0x2c - MxU32 m_flags; // 0x30 - MxLong m_startTime; // 0x34 - MxLong m_duration; // 0x38 - MxS32 m_loopCount; // 0x3c - Vector3Data m_location; // 0x40 - Vector3Data m_direction; // 0x54 - Vector3Data m_up; // 0x68 - char* m_extraData; // 0x7c - MxU16 m_extraLength; // 0x80 - MxCore* m_unk84; // 0x84 - undefined4 m_unk88; // 0x88 - MxCore* m_origin; // 0x8c - MxLong m_unkTimingField; // 0x90 + MxU32 m_sizeOnDisk; // 0x2c + MxU32 m_flags; // 0x30 + MxLong m_startTime; // 0x34 + MxLong m_duration; // 0x38 + MxS32 m_loopCount; // 0x3c + Vector3Data m_location; // 0x40 + Vector3Data m_direction; // 0x54 + Vector3Data m_up; // 0x68 + char* m_extraData; // 0x7c + MxU16 m_extraLength; // 0x80 + MxCore* m_unk0x84; // 0x84 + undefined4 m_unk0x88; // 0x88 + MxCore* m_origin; // 0x8c + MxLong m_unk0xTimingField; // 0x90 }; #endif // MXDSACTION_H diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/mxdsactionlist.h index a467bf52..32399c4b 100644 --- a/LEGO1/mxdsactionlist.h +++ b/LEGO1/mxdsactionlist.h @@ -16,14 +16,14 @@ class MxDSAction; // SIZE 0x1c class MxDSActionList : public MxList { public: - MxDSActionList() { this->m_unk18 = 0; } + MxDSActionList() { this->m_unk0x18 = 0; } virtual MxS8 Compare(MxDSAction*, MxDSAction*) override; // vtable+0x14 static void Destroy(MxDSAction* p_action); private: - undefined m_unk18; + undefined m_unk0x18; }; // VTABLE: LEGO1 0x100d7e68 diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/mxdsbuffer.cpp index ed280db8..10cba431 100644 --- a/LEGO1/mxdsbuffer.cpp +++ b/LEGO1/mxdsbuffer.cpp @@ -8,17 +8,17 @@ DECOMP_SIZE_ASSERT(MxDSBuffer, 0x34); // FUNCTION: LEGO1 0x100c6470 MxDSBuffer::MxDSBuffer() { - m_unk20 = 0; + m_unk0x20 = 0; m_pBuffer = NULL; m_pIntoBuffer = NULL; m_pIntoBuffer2 = NULL; - m_unk14 = 0; - m_unk18 = 0; - m_unk1c = 0; + m_unk0x14 = 0; + m_unk0x18 = 0; + m_unk0x1c = 0; m_writeOffset = 0; m_bytesRemaining = 0; m_mode = MxDSBufferType_Preallocated; - m_unk30 = 0; + m_unk0x30 = 0; } // FUNCTION: LEGO1 0x100c6530 @@ -33,8 +33,8 @@ MxDSBuffer::~MxDSBuffer() } } - m_unk14 = 0; - m_unk1c = 0; + m_unk0x14 = 0; + m_unk0x1c = 0; } // FUNCTION: LEGO1 0x100c6640 diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/mxdsbuffer.h index e253b2a5..d0e7c4ee 100644 --- a/LEGO1/mxdsbuffer.h +++ b/LEGO1/mxdsbuffer.h @@ -36,14 +36,14 @@ class MxDSBuffer : public MxCore { MxU8* m_pBuffer; MxU8* m_pIntoBuffer; MxU8* m_pIntoBuffer2; - undefined4 m_unk14; - undefined4 m_unk18; - undefined4 m_unk1c; - undefined2 m_unk20; + undefined4 m_unk0x14; + undefined4 m_unk0x18; + undefined4 m_unk0x1c; + undefined2 m_unk0x20; MxDSBufferType m_mode; MxU32 m_writeOffset; MxU32 m_bytesRemaining; - undefined4 m_unk30; + undefined4 m_unk0x30; }; #endif // MXDSBUFFER_H diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/mxdschunk.cpp index 1898d6a8..8b64bc0c 100644 --- a/LEGO1/mxdschunk.cpp +++ b/LEGO1/mxdschunk.cpp @@ -7,7 +7,7 @@ MxDSChunk::MxDSChunk() { m_flags = 0; m_data = NULL; - m_unk0c = -1; + m_unk0x0c = -1; m_time = 0; m_length = 0; } diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h index dc84a971..dcb2cf7b 100644 --- a/LEGO1/mxdschunk.h +++ b/LEGO1/mxdschunk.h @@ -50,11 +50,11 @@ class MxDSChunk : public MxCore { } private: - MxU16 m_flags; // 0x8 - undefined4 m_unk0c; // 0xc - MxLong m_time; // 0x10 - MxU32 m_length; // 0x14 - MxU8* m_data; // 0x18 + MxU16 m_flags; // 0x8 + undefined4 m_unk0x0c; // 0xc + MxLong m_time; // 0x10 + MxU32 m_length; // 0x14 + MxU8* m_data; // 0x18 }; #endif // MXDSCHUNK_H diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/mxdsmediaaction.cpp index ccb12a07..066cb66c 100644 --- a/LEGO1/mxdsmediaaction.cpp +++ b/LEGO1/mxdsmediaaction.cpp @@ -8,12 +8,12 @@ DECOMP_SIZE_ASSERT(MxDSMediaAction, 0xb8) MxDSMediaAction::MxDSMediaAction() { this->m_mediaSrcPath = NULL; - this->m_unk9c.m_unk00 = 0; - this->m_unk9c.m_unk04 = 0; + this->m_unk0x9c.m_unk0x00 = 0; + this->m_unk0x9c.m_unk0x04 = 0; this->m_framesPerSecond = 0; this->m_mediaFormat = 0; this->m_paletteManagement = 1; - this->m_unkb4 = -1; + this->m_unk0xb4 = -1; this->m_sustainTime = 0; this->SetType(MxDSType_MediaAction); } @@ -29,7 +29,7 @@ void MxDSMediaAction::CopyFrom(MxDSMediaAction& p_dsMediaAction) { CopyMediaSrcPath(p_dsMediaAction.m_mediaSrcPath); - this->m_unk9c = p_dsMediaAction.m_unk9c; + this->m_unk0x9c = p_dsMediaAction.m_unk0x9c; this->m_framesPerSecond = p_dsMediaAction.m_framesPerSecond; this->m_mediaFormat = p_dsMediaAction.m_mediaFormat; this->m_paletteManagement = p_dsMediaAction.m_paletteManagement; @@ -85,8 +85,8 @@ void MxDSMediaAction::Deserialize(char** p_source, MxS16 p_unk24) MxDSAction::Deserialize(p_source, p_unk24); GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath); - GetScalar(p_source, this->m_unk9c.m_unk00); - GetScalar(p_source, this->m_unk9c.m_unk04); + GetScalar(p_source, this->m_unk0x9c.m_unk0x00); + GetScalar(p_source, this->m_unk0x9c.m_unk0x04); GetScalar(p_source, this->m_framesPerSecond); GetScalar(p_source, this->m_mediaFormat); GetScalar(p_source, this->m_paletteManagement); diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/mxdsmediaaction.h index ecbf7ae3..b6975776 100644 --- a/LEGO1/mxdsmediaaction.h +++ b/LEGO1/mxdsmediaaction.h @@ -41,14 +41,14 @@ class MxDSMediaAction : public MxDSAction { MxU32 m_sizeOnDisk; // 0x94 char* m_mediaSrcPath; // 0x98 struct { - undefined4 m_unk00; - undefined4 m_unk04; - } m_unk9c; // 0x9c + undefined4 m_unk0x00; + undefined4 m_unk0x04; + } m_unk0x9c; // 0x9c MxS32 m_framesPerSecond; // 0xa4 MxS32 m_mediaFormat; // 0xa8 MxS32 m_paletteManagement; // 0xac MxLong m_sustainTime; // 0xb0 - undefined4 m_unkb4; // 0xb4 + undefined4 m_unk0xb4; // 0xb4 }; #endif // MXDSMEDIAACTION_H diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/mxdsmultiaction.cpp index b2b31abe..38c4433c 100644 --- a/LEGO1/mxdsmultiaction.cpp +++ b/LEGO1/mxdsmultiaction.cpp @@ -55,7 +55,7 @@ MxDSMultiAction& MxDSMultiAction::operator=(MxDSMultiAction& p_dsMultiAction) // FUNCTION: LEGO1 0x100ca290 void MxDSMultiAction::SetUnkTimingField(MxLong p_unkTimingField) { - this->m_unkTimingField = p_unkTimingField; + this->m_unk0xTimingField = p_unkTimingField; MxDSActionListCursor cursor(this->m_actions); MxDSAction* action; diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp index 4a90fc23..e7f23d11 100644 --- a/LEGO1/mxdsobject.cpp +++ b/LEGO1/mxdsobject.cpp @@ -24,11 +24,11 @@ MxDSObject::MxDSObject() { this->SetType(MxDSType_Object); this->m_sourceName = NULL; - this->m_unk14 = 0; + this->m_unk0x14 = 0; this->m_objectName = NULL; - this->m_unk24 = -1; + this->m_unk0x24 = -1; this->m_objectId = -1; - this->m_unk28 = 0; + this->m_unk0x28 = 0; } // FUNCTION: LEGO1 0x100bf7e0 @@ -42,12 +42,12 @@ MxDSObject::~MxDSObject() void MxDSObject::CopyFrom(MxDSObject& p_dsObject) { this->SetSourceName(p_dsObject.m_sourceName); - this->m_unk14 = p_dsObject.m_unk14; + this->m_unk0x14 = p_dsObject.m_unk0x14; this->SetObjectName(p_dsObject.m_objectName); this->m_objectId = p_dsObject.m_objectId; - this->m_unk24 = p_dsObject.m_unk24; + this->m_unk0x24 = p_dsObject.m_unk0x24; this->m_atomId = p_dsObject.m_atomId; - this->m_unk28 = p_dsObject.m_unk28; + this->m_unk0x28 = p_dsObject.m_unk0x28; } // FUNCTION: LEGO1 0x100bf8c0 @@ -130,11 +130,11 @@ MxU32 MxDSObject::GetSizeOnDisk() void MxDSObject::Deserialize(char** p_source, MxS16 p_unk24) { GetString(p_source, this->m_sourceName, this, &MxDSObject::SetSourceName); - GetScalar(p_source, this->m_unk14); + GetScalar(p_source, this->m_unk0x14); GetString(p_source, this->m_objectName, this, &MxDSObject::SetObjectName); GetScalar(p_source, this->m_objectId); - this->m_unk24 = p_unk24; + this->m_unk0x24 = p_unk24; } // FUNCTION: LEGO1 0x100bfb30 diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h index 75146d94..bf422e44 100644 --- a/LEGO1/mxdsobject.h +++ b/LEGO1/mxdsobject.h @@ -41,22 +41,22 @@ class MxDSObject : public MxCore { inline const char* GetSourceName() const { return this->m_sourceName; } inline MxU32 GetObjectId() { return this->m_objectId; } inline const MxAtomId& GetAtomId() { return this->m_atomId; } - inline MxS16 GetUnknown24() { return this->m_unk24; } + inline MxS16 GetUnknown24() { return this->m_unk0x24; } inline void SetType(MxDSType p_type) { this->m_type = p_type; } inline void SetObjectId(MxU32 p_objectId) { this->m_objectId = p_objectId; } - inline void SetUnknown24(MxS16 p_unk24) { this->m_unk24 = p_unk24; } + inline void SetUnknown24(MxS16 p_unk24) { this->m_unk0x24 = p_unk24; } private: - MxU32 m_sizeOnDisk; // 0x8 - MxU16 m_type; // 0xc - char* m_sourceName; // 0x10 - undefined4 m_unk14; // 0x14 - char* m_objectName; // 0x18 - MxU32 m_objectId; // 0x1c - MxAtomId m_atomId; // 0x20 - MxS16 m_unk24; // 0x24 - undefined4 m_unk28; // 0x28 + MxU32 m_sizeOnDisk; // 0x8 + MxU16 m_type; // 0xc + char* m_sourceName; // 0x10 + undefined4 m_unk0x14; // 0x14 + char* m_objectName; // 0x18 + MxU32 m_objectId; // 0x1c + MxAtomId m_atomId; // 0x20 + MxS16 m_unk0x24; // 0x24 + undefined4 m_unk0x28; // 0x28 }; MxDSObject* DeserializeDSObjectDispatch(char**, MxS16); diff --git a/LEGO1/mxdsstreamingaction.cpp b/LEGO1/mxdsstreamingaction.cpp index 1117cdf4..c62b4434 100644 --- a/LEGO1/mxdsstreamingaction.cpp +++ b/LEGO1/mxdsstreamingaction.cpp @@ -10,7 +10,7 @@ MxDSStreamingAction::MxDSStreamingAction(MxDSAction& p_dsAction, MxU32 p_offset) Init(); *this = p_dsAction; - this->m_unk94 = p_offset; + this->m_unk0x94 = p_offset; this->m_bufferOffset = p_offset; } @@ -32,10 +32,10 @@ MxDSStreamingAction::MxDSStreamingAction(MxDSStreamingAction& p_dsStreamingActio // FUNCTION: LEGO1 0x100cd150 MxDSStreamingAction::~MxDSStreamingAction() { - if (this->m_unka0) - delete this->m_unka0; - if (this->m_unka4) - delete this->m_unka4; + if (this->m_unk0xa0) + delete this->m_unk0xa0; + if (this->m_unk0xa4) + delete this->m_unk0xa4; if (this->m_internalAction) delete this->m_internalAction; } @@ -43,13 +43,13 @@ MxDSStreamingAction::~MxDSStreamingAction() // FUNCTION: LEGO1 0x100cd1e0 MxResult MxDSStreamingAction::Init() { - this->m_unk94 = 0; + this->m_unk0x94 = 0; this->m_bufferOffset = 0; - this->m_unk9c = 0; - this->m_unka0 = NULL; - this->m_unka4 = NULL; - this->m_unka8 = 0; - this->m_unkac = 2; + this->m_unk0x9c = 0; + this->m_unk0xa0 = NULL; + this->m_unk0xa4 = NULL; + this->m_unk0xa8 = 0; + this->m_unk0xac = 2; this->m_internalAction = NULL; return SUCCESS; } @@ -58,13 +58,13 @@ MxResult MxDSStreamingAction::Init() MxDSStreamingAction* MxDSStreamingAction::CopyFrom(MxDSStreamingAction& p_dsStreamingAction) { *this = p_dsStreamingAction; - this->m_unk94 = p_dsStreamingAction.m_unk94; + this->m_unk0x94 = p_dsStreamingAction.m_unk0x94; this->m_bufferOffset = p_dsStreamingAction.m_bufferOffset; - this->m_unk9c = p_dsStreamingAction.m_unk9c; - this->m_unka0 = NULL; - this->m_unka4 = NULL; - this->m_unkac = p_dsStreamingAction.m_unkac; - this->m_unka8 = p_dsStreamingAction.m_unka8; + this->m_unk0x9c = p_dsStreamingAction.m_unk0x9c; + this->m_unk0xa0 = NULL; + this->m_unk0xa4 = NULL; + this->m_unk0xac = p_dsStreamingAction.m_unk0xac; + this->m_unk0xa8 = p_dsStreamingAction.m_unk0xa8; SetInternalAction(p_dsStreamingAction.m_internalAction ? p_dsStreamingAction.m_internalAction->Clone() : NULL); return this; @@ -88,5 +88,5 @@ void MxDSStreamingAction::FUN_100CD2D0() this->m_loopCount--; this->m_duration -= duration; - this->m_unka8 += duration; + this->m_unk0xa8 += duration; } diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/mxdsstreamingaction.h index b5a1e6c1..39ad33f7 100644 --- a/LEGO1/mxdsstreamingaction.h +++ b/LEGO1/mxdsstreamingaction.h @@ -32,13 +32,13 @@ class MxDSStreamingAction : public MxDSAction { void FUN_100CD2D0(); private: - MxU32 m_unk94; + MxU32 m_unk0x94; MxU32 m_bufferOffset; - MxS32 m_unk9c; - MxDSBuffer* m_unka0; - MxDSBuffer* m_unka4; - MxLong m_unka8; - undefined2 m_unkac; + MxS32 m_unk0x9c; + MxDSBuffer* m_unk0xa0; + MxDSBuffer* m_unk0xa4; + MxLong m_unk0xa8; + undefined2 m_unk0xac; MxDSAction* m_internalAction; }; diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/mxloopingflcpresenter.cpp index c06c8f42..4a8b3ff1 100644 --- a/LEGO1/mxloopingflcpresenter.cpp +++ b/LEGO1/mxloopingflcpresenter.cpp @@ -19,7 +19,7 @@ MxLoopingFlcPresenter::~MxLoopingFlcPresenter() // FUNCTION: LEGO1 0x100b4410 void MxLoopingFlcPresenter::Init() { - this->m_unk68 = 0; + this->m_unk0x68 = 0; this->m_flags &= 0xfd; this->m_flags &= 0xfb; } @@ -42,7 +42,7 @@ void MxLoopingFlcPresenter::NextFrame() else { LoadFrame(chunk); AppendChunk(chunk); - m_unk68 += m_flicHeader->speed; + m_unk0x68 += m_flicHeader->speed; } m_subscriber->FUN_100b8390(chunk); diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/mxloopingflcpresenter.h index d7c18546..e4f781c9 100644 --- a/LEGO1/mxloopingflcpresenter.h +++ b/LEGO1/mxloopingflcpresenter.h @@ -24,7 +24,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter { void Init(); void Destroy(MxBool p_fromDestructor); - undefined4 m_unk68; + undefined4 m_unk0x68; }; #endif // MXLOOPINGFLCPRESENTER_H diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/mxloopingsmkpresenter.cpp index ce4f41c2..26cf3d43 100644 --- a/LEGO1/mxloopingsmkpresenter.cpp +++ b/LEGO1/mxloopingsmkpresenter.cpp @@ -19,7 +19,7 @@ MxLoopingSmkPresenter::~MxLoopingSmkPresenter() // FUNCTION: LEGO1 0x100b49b0 void MxLoopingSmkPresenter::Init() { - this->m_unk720 = 0; + this->m_unk0x720 = 0; this->m_flags &= 0xfd; this->m_flags &= 0xfb; } diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/mxloopingsmkpresenter.h index 16061cee..b2eba1ca 100644 --- a/LEGO1/mxloopingsmkpresenter.h +++ b/LEGO1/mxloopingsmkpresenter.h @@ -22,7 +22,7 @@ class MxLoopingSmkPresenter : public MxSmkPresenter { void Init(); void Destroy(MxBool p_fromDestructor); - undefined4 m_unk720; + undefined4 m_unk0x720; }; #endif // MXLOOPINGSMKPRESENTER_H diff --git a/LEGO1/mxmusicmanager.cpp b/LEGO1/mxmusicmanager.cpp index 4541cf19..58ffe35d 100644 --- a/LEGO1/mxmusicmanager.cpp +++ b/LEGO1/mxmusicmanager.cpp @@ -31,11 +31,11 @@ void MxMusicManager::InitData() { m_MIDIStreamH = 0; m_MIDIInitialized = FALSE; - m_unk38 = 0; - m_unk3c = 0; - m_unk40 = 0; - m_unk44 = 0; - m_unk48 = 0; + m_unk0x38 = 0; + m_unk0x3c = 0; + m_unk0x40 = 0; + m_unk0x44 = 0; + m_unk0x48 = 0; m_MIDIHdrP = NULL; } diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/mxmusicmanager.h index 7b594803..c79b0cb2 100644 --- a/LEGO1/mxmusicmanager.h +++ b/LEGO1/mxmusicmanager.h @@ -29,11 +29,11 @@ class MxMusicManager : public MxAudioManager { HMIDISTRM m_MIDIStreamH; // 0x30 MxBool m_MIDIInitialized; // 0x34 - undefined4 m_unk38; // 0x38 - undefined4 m_unk3c; // 0x3c - undefined4 m_unk40; // 0x40 - undefined4 m_unk44; // 0x44 - undefined4 m_unk48; // 0x48 + undefined4 m_unk0x38; // 0x38 + undefined4 m_unk0x3c; // 0x3c + undefined4 m_unk0x40; // 0x40 + undefined4 m_unk0x44; // 0x44 + undefined4 m_unk0x48; // 0x48 MIDIHDR* m_MIDIHdrP; // 0x4c MxS32 m_multiplier; // 0x50 DWORD m_MIDIVolume; // 0x54 diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/mxnextactiondatastart.h index bf0719e3..c2b5d080 100644 --- a/LEGO1/mxnextactiondatastart.h +++ b/LEGO1/mxnextactiondatastart.h @@ -11,7 +11,7 @@ class MxNextActionDataStart : public MxCore { inline MxNextActionDataStart(MxU32 p_objectId, MxS16 p_unk24val, MxU32 p_data) { m_objectId = p_objectId; - m_unk24val = p_unk24val; + m_unk0x24val = p_unk24val; m_data = p_data; } @@ -29,11 +29,11 @@ class MxNextActionDataStart : public MxCore { } inline MxU32 GetObjectId() const { return m_objectId; } - inline MxS16 GetUnknown24() const { return m_unk24val; } + inline MxS16 GetUnknown24() const { return m_unk0x24val; } private: MxU32 m_objectId; - MxS16 m_unk24val; + MxS16 m_unk0x24val; MxU32 m_data; }; diff --git a/LEGO1/mxnotificationmanager.cpp b/LEGO1/mxnotificationmanager.cpp index f7bdcd70..cc9f3930 100644 --- a/LEGO1/mxnotificationmanager.cpp +++ b/LEGO1/mxnotificationmanager.cpp @@ -27,7 +27,7 @@ MxNotification::~MxNotification() // FUNCTION: LEGO1 0x100ac250 MxNotificationManager::MxNotificationManager() : MxCore(), m_lock(), m_listenerIds() { - m_unk2c = 0; + m_unk0x2c = 0; m_queue = NULL; m_active = TRUE; m_sendList = NULL; diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/mxnotificationmanager.h index 9ab9c733..4a3d8726 100644 --- a/LEGO1/mxnotificationmanager.h +++ b/LEGO1/mxnotificationmanager.h @@ -30,7 +30,7 @@ class MxNotificationManager : public MxCore { MxNotificationPtrList* m_queue; // 0x8 MxNotificationPtrList* m_sendList; // 0xc MxCriticalSection m_lock; // 0x10 - MxS32 m_unk2c; // 0x2c + MxS32 m_unk0x2c; // 0x2c MxIdList m_listenerIds; // 0x30 MxBool m_active; // 0x3c diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/mxsoundmanager.h index b804ef23..1ffe24df 100644 --- a/LEGO1/mxsoundmanager.h +++ b/LEGO1/mxsoundmanager.h @@ -31,7 +31,7 @@ class MxSoundManager : public MxAudioManager { LPDIRECTSOUND m_directSound; // 0x30 LPDIRECTSOUNDBUFFER m_dsBuffer; // 0x34 - undefined m_unk38[4]; + undefined m_unk0x38[4]; }; #endif // MXSOUNDMANAGER_H diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp index 278b24cf..bfdf218d 100644 --- a/LEGO1/mxstillpresenter.cpp +++ b/LEGO1/mxstillpresenter.cpp @@ -93,7 +93,7 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk) if (m_flags & Flag_Bit2) { undefined4 unk = 0; - m_unk58 = MxOmni::GetInstance()->GetVideoManager()->GetDisplaySurface()->vtable44( + m_unk0x58 = MxOmni::GetInstance()->GetVideoManager()->GetDisplaySurface()->vtable44( m_bitmap, &unk, (m_flags & Flag_Bit4) / 8, @@ -106,7 +106,7 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk) delete m_bitmap; m_bitmap = NULL; - if (m_unk58 && unk) + if (m_unk0x58 && unk) m_flags |= Flag_Bit3; else m_flags &= ~Flag_Bit3; diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/mxstreamchunk.h index 8f3c421e..817d699f 100644 --- a/LEGO1/mxstreamchunk.h +++ b/LEGO1/mxstreamchunk.h @@ -7,7 +7,7 @@ // SIZE 0x20 class MxStreamChunk : public MxDSChunk { public: - inline MxStreamChunk() : m_unk1c(NULL) {} + inline MxStreamChunk() : m_unk0x1c(NULL) {} // FUNCTION: LEGO1 0x100b1fe0 inline virtual const char* ClassName() const override // vtable+0xc @@ -23,7 +23,7 @@ class MxStreamChunk : public MxDSChunk { } private: - void* m_unk1c; // 0x1c + void* m_unk0x1c; // 0x1c }; #endif // MXSTREAMCHUNK_H diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp index 6fafb2c7..b6e13843 100644 --- a/LEGO1/mxstreamcontroller.cpp +++ b/LEGO1/mxstreamcontroller.cpp @@ -30,7 +30,7 @@ MxResult MxStreamController::vtable0x28() MxStreamController::MxStreamController() { m_provider = NULL; - m_unk2c = 0; // TODO: probably also NULL + m_unk0x2c = 0; // TODO: probably also NULL m_action0x60 = NULL; } @@ -122,7 +122,7 @@ MxResult MxStreamController::vtable0x24(MxDSAction* p_action) { MxAutoLocker locker(&m_criticalSection); vtable0x30(p_action); - m_action0x60 = m_unkList0x54.Find(p_action, TRUE); + m_action0x60 = m_unk0xList0x54.Find(p_action, TRUE); if (m_action0x60 == NULL) { return FAILURE; } @@ -167,7 +167,7 @@ MxResult MxStreamController::vtable0x30(MxDSAction* p_unknown) { MxAutoLocker locker(&m_criticalSection); MxResult result = FAILURE; - MxDSAction* action = m_unkList0x3c.Find(p_unknown, TRUE); + MxDSAction* action = m_unk0xList0x3c.Find(p_unknown, TRUE); if (action != NULL) { MxNextActionDataStart* data = m_nextActionList.Find(action->GetObjectId(), action->GetUnknown24()); delete action; diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h index fe26b905..998f832c 100644 --- a/LEGO1/mxstreamcontroller.h +++ b/LEGO1/mxstreamcontroller.h @@ -52,11 +52,11 @@ class MxStreamController : public MxCore { MxCriticalSection m_criticalSection; // 0x8 MxAtomId atom; // 0x24 MxStreamProvider* m_provider; // 0x28 - undefined4 m_unk2c; // 0x2c + undefined4 m_unk0x2c; // 0x2c MxStreamListMxDSSubscriber m_subscriberList; // 0x30 - MxStreamListMxDSAction m_unkList0x3c; // 0x3c + MxStreamListMxDSAction m_unk0xList0x3c; // 0x3c MxStreamListMxNextActionDataStart m_nextActionList; // 0x48 - MxStreamListMxDSAction m_unkList0x54; // 0x54 + MxStreamListMxDSAction m_unk0xList0x54; // 0x54 MxDSAction* m_action0x60; // 0x60 }; diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp index f00ba6e3..50f55331 100644 --- a/LEGO1/mxstreamer.cpp +++ b/LEGO1/mxstreamer.cpp @@ -180,7 +180,7 @@ MxStreamerSubClass1::MxStreamerSubClass1(undefined4 size) { m_buffer = NULL; m_size = size; - undefined4* ptr = &m_unk08; + undefined4* ptr = &m_unk0x08; for (int i = 0; i >= 0; i--) { ptr[i] = 0; } diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h index 80b8ac5a..a47ad495 100644 --- a/LEGO1/mxstreamer.h +++ b/LEGO1/mxstreamer.h @@ -22,12 +22,12 @@ class MxStreamerSubClass1 { void SetBuffer(undefined* p_buf) { m_buffer = p_buf; } inline undefined* GetBuffer() const { return m_buffer; } - inline undefined4 GetUnk08() const { return m_unk08; } + inline undefined4 GetUnk08() const { return m_unk0x08; } private: undefined* m_buffer; undefined4 m_size; - undefined4 m_unk08; + undefined4 m_unk0x08; }; class MxStreamerSubClass2 : public MxStreamerSubClass1 { diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/mxtransitionmanager.cpp index 652dd628..303485ec 100644 --- a/LEGO1/mxtransitionmanager.cpp +++ b/LEGO1/mxtransitionmanager.cpp @@ -22,8 +22,8 @@ MxTransitionManager::MxTransitionManager() m_waitIndicator = NULL; m_copyBuffer = NULL; m_copyFlags.bit0 = FALSE; - m_unk28.bit0 = FALSE; - m_unk24 = 0; + m_unk0x28.bit0 = FALSE; + m_unk0x24 = 0; } // FUNCTION: LEGO1 0x1004ba00 diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/mxtransitionmanager.h index d3b49526..d8551e7f 100644 --- a/LEGO1/mxtransitionmanager.h +++ b/LEGO1/mxtransitionmanager.h @@ -60,8 +60,8 @@ class MxTransitionManager : public MxCore { MxU8* m_copyBuffer; flag_bitfield m_copyFlags; - undefined4 m_unk24; - flag_bitfield m_unk28; + undefined4 m_unk0x24; + flag_bitfield m_unk0x28; TransitionType m_transitionType; LPDIRECTDRAWSURFACE m_ddSurface; diff --git a/LEGO1/mxtype17notificationparam.h b/LEGO1/mxtype17notificationparam.h index 061cb768..cf4e78fa 100644 --- a/LEGO1/mxtype17notificationparam.h +++ b/LEGO1/mxtype17notificationparam.h @@ -7,14 +7,14 @@ // ??? This type is handled, but seemingly never created and no VTABLE fits class MxType17NotificationParam : public MxNotificationParam { public: - inline MxU32 GetUnknown20() { return m_unk20; } - inline MxU16 GetUnknown28() { return m_unk28; } + inline MxU32 GetUnknown20() { return m_unk0x20; } + inline MxU16 GetUnknown28() { return m_unk0x28; } protected: - undefined m_unkc[0x14]; - MxU32 m_unk20; - undefined4 m_unk24; - MxU16 m_unk28; + undefined m_unk0xc[0x14]; + MxU32 m_unk0x20; + undefined4 m_unk0x24; + MxU16 m_unk0x28; }; #endif // MXTYPE17NOTIFICATIONPARAM_H diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp index e748e9b9..10dae565 100644 --- a/LEGO1/mxvideomanager.cpp +++ b/LEGO1/mxvideomanager.cpp @@ -32,7 +32,7 @@ MxResult MxVideoManager::Init() this->m_displaySurface = NULL; this->m_region = NULL; this->m_videoParam.SetPalette(NULL); - this->m_unk60 = FALSE; + this->m_unk0x60 = FALSE; return SUCCESS; } @@ -57,7 +57,7 @@ void MxVideoManager::Destroy(MxBool p_fromDestructor) if (m_videoParam.GetPalette()) delete m_videoParam.GetPalette(); - if (m_unk60) { + if (m_unk0x60) { if (m_pDirectDraw) m_pDirectDraw->Release(); if (m_pDDSurface) @@ -129,7 +129,7 @@ MxResult MxVideoManager::vtable0x28( MxBool locked = FALSE; MxResult status = FAILURE; - m_unk60 = FALSE; + m_unk0x60 = FALSE; if (MxMediaManager::InitPresenters() != SUCCESS) goto done; @@ -194,7 +194,7 @@ MxResult MxVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool locked = FALSE; MxResult status = FAILURE; - m_unk60 = TRUE; + m_unk0x60 = TRUE; if (MxMediaManager::InitPresenters() != SUCCESS) goto done; diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h index 05cfd99b..4558121c 100644 --- a/LEGO1/mxvideomanager.h +++ b/LEGO1/mxvideomanager.h @@ -47,7 +47,7 @@ class MxVideoManager : public MxMediaManager { LPDIRECTDRAWSURFACE m_pDDSurface; // 0x54 MxDisplaySurface* m_displaySurface; // 0x58 MxRegion* m_region; // 0x5c - MxBool m_unk60; // 0x60 + MxBool m_unk0x60; // 0x60 }; #endif // MXVIDEOMANAGER_H diff --git a/LEGO1/mxvideoparam.cpp b/LEGO1/mxvideoparam.cpp index 5d037c0c..a186470f 100644 --- a/LEGO1/mxvideoparam.cpp +++ b/LEGO1/mxvideoparam.cpp @@ -16,7 +16,7 @@ MxVideoParam::MxVideoParam() this->m_rect.SetTop(0); this->m_palette = NULL; this->m_backBuffers = 0; - this->m_unk1c = 0; + this->m_unk0x1c = 0; this->m_deviceId = NULL; } @@ -32,7 +32,7 @@ MxVideoParam::MxVideoParam( this->m_palette = p_pal; this->m_backBuffers = p_backBuffers; this->m_flags = p_flags; - this->m_unk1c = 0; + this->m_unk0x1c = 0; this->m_deviceId = NULL; } @@ -43,7 +43,7 @@ MxVideoParam::MxVideoParam(MxVideoParam& p_videoParam) this->m_palette = p_videoParam.m_palette; this->m_backBuffers = p_videoParam.m_backBuffers; this->m_flags = p_videoParam.m_flags; - this->m_unk1c = p_videoParam.m_unk1c; + this->m_unk0x1c = p_videoParam.m_unk0x1c; this->m_deviceId = NULL; SetDeviceName(p_videoParam.m_deviceId); } @@ -80,7 +80,7 @@ MxVideoParam& MxVideoParam::operator=(const MxVideoParam& p_videoParam) this->m_palette = p_videoParam.m_palette; this->m_backBuffers = p_videoParam.m_backBuffers; this->m_flags = p_videoParam.m_flags; - this->m_unk1c = p_videoParam.m_unk1c; + this->m_unk0x1c = p_videoParam.m_unk0x1c; SetDeviceName(p_videoParam.m_deviceId); return *this; diff --git a/LEGO1/mxvideoparam.h b/LEGO1/mxvideoparam.h index f44bce88..916bb243 100644 --- a/LEGO1/mxvideoparam.h +++ b/LEGO1/mxvideoparam.h @@ -36,7 +36,7 @@ class MxVideoParam { MxPalette* m_palette; // 0x10 MxU32 m_backBuffers; // 0x14 MxVideoParamFlags m_flags; // 0x18 - int m_unk1c; // 0x1c + int m_unk0x1c; // 0x1c char* m_deviceId; // 0x20 }; diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp index a8673b48..da7dfc07 100644 --- a/LEGO1/mxvideopresenter.cpp +++ b/LEGO1/mxvideopresenter.cpp @@ -46,7 +46,7 @@ void MxVideoPresenter::Destroy() // FUNCTION: LEGO1 0x1000c7b0 LPDIRECTDRAWSURFACE MxVideoPresenter::VTable0x78() { - return m_unk58; + return m_unk0x58; } // FUNCTION: LEGO1 0x1000c7c0 @@ -185,9 +185,9 @@ void MxVideoPresenter::Init() { m_bitmap = NULL; m_alpha = NULL; - m_unk5c = 1; - m_unk58 = NULL; - m_unk60 = -1; + m_unk0x5c = 1; + m_unk0x58 = NULL; + m_unk0x60 = -1; m_flags = m_flags & 0xfe; if (MVideoManager() != NULL) { @@ -206,9 +206,9 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor) if (MVideoManager() != NULL) MVideoManager()->RemovePresenter(*this); - if (m_unk58) { - m_unk58->Release(); - m_unk58 = NULL; + if (m_unk0x58) { + m_unk0x58->Release(); + m_unk0x58 = NULL; m_flags = m_flags & 0xfd; m_flags = m_flags & 0xfb; } @@ -357,7 +357,7 @@ void MxVideoPresenter::StreamingTickle() } } else { - for (MxS16 i = 0; i < m_unk5c; i++) { + for (MxS16 i = 0; i < m_unk0x5c; i++) { if (!m_currentChunk) { MxMediaPresenter::StreamingTickle(); @@ -378,7 +378,7 @@ void MxVideoPresenter::StreamingTickle() } if (m_flags & Flag_Bit1) - m_unk5c = 5; + m_unk0x5c = 5; } } @@ -396,7 +396,7 @@ void MxVideoPresenter::RepeatingTickle() } } else { - for (MxS16 i = 0; i < m_unk5c; i++) { + for (MxS16 i = 0; i < m_unk0x5c; i++) { if (!m_currentChunk) { MxMediaPresenter::RepeatingTickle(); @@ -416,7 +416,7 @@ void MxVideoPresenter::RepeatingTickle() } if (m_flags & Flag_Bit1) - m_unk5c = 5; + m_unk0x5c = 5; } } } @@ -428,10 +428,10 @@ void MxVideoPresenter::Unk5Tickle() if (sustainTime != -1) { if (sustainTime) { - if (m_unk60 == -1) - m_unk60 = m_action->GetElapsedTime(); + if (m_unk0x60 == -1) + m_unk0x60 = m_action->GetElapsedTime(); - if (m_action->GetElapsedTime() >= m_unk60 + ((MxDSMediaAction*) m_action)->GetSustainTime()) { + if (m_action->GetElapsedTime() >= m_unk0x60 + ((MxDSMediaAction*) m_action)->GetSustainTime()) { m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Done; } diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h index fc3aca5c..d25ecb2b 100644 --- a/LEGO1/mxvideopresenter.h +++ b/LEGO1/mxvideopresenter.h @@ -76,12 +76,12 @@ class MxVideoPresenter : public MxMediaPresenter { protected: void Destroy(MxBool p_fromDestructor); - MxBitmap* m_bitmap; // 0x50 - AlphaMask* m_alpha; // 0x54 - LPDIRECTDRAWSURFACE m_unk58; // 0x58 - MxS16 m_unk5c; // 0x5c - MxU8 m_flags; // 0x5e - MxLong m_unk60; // 0x60 + MxBitmap* m_bitmap; // 0x50 + AlphaMask* m_alpha; // 0x54 + LPDIRECTDRAWSURFACE m_unk0x58; // 0x58 + MxS16 m_unk0x5c; // 0x5c + MxU8 m_flags; // 0x5e + MxLong m_unk0x60; // 0x60 }; #endif // MXVIDEOPRESENTER_H diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/mxwavepresenter.cpp index 3468b538..9f0e87f0 100644 --- a/LEGO1/mxwavepresenter.cpp +++ b/LEGO1/mxwavepresenter.cpp @@ -38,7 +38,7 @@ void MxWavePresenter::Init() m_lockSize = 0; m_writtenChunks = 0; m_started = FALSE; - m_unk66 = FALSE; + m_unk0x66 = FALSE; m_paused = FALSE; } @@ -170,7 +170,7 @@ void MxWavePresenter::StartingTickle() memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); - if (m_unk66) + if (m_unk0x66) desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRL3D | DSBCAPS_CTRLVOLUME; else desc.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME; diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/mxwavepresenter.h index cdaca2c4..ddb2b480 100644 --- a/LEGO1/mxwavepresenter.h +++ b/LEGO1/mxwavepresenter.h @@ -63,7 +63,7 @@ class MxWavePresenter : public MxSoundPresenter { MxU32 m_lockSize; // 0x60 MxU8 m_writtenChunks; // 0x64 MxBool m_started; // 0x65 - MxBool m_unk66; // 0x66 + MxBool m_unk0x66; // 0x66 MxS8 m_silenceData; // 0x67 MxBool m_paused; // 0x68 }; diff --git a/LEGO1/pizza.cpp b/LEGO1/pizza.cpp index 1a07d27a..3b0201f6 100644 --- a/LEGO1/pizza.cpp +++ b/LEGO1/pizza.cpp @@ -5,13 +5,13 @@ DECOMP_SIZE_ASSERT(Pizza, 0x9c); // FUNCTION: LEGO1 0x10037ef0 Pizza::Pizza() { - this->m_unk7c = 0; - this->m_unk80 = 0; - this->m_unk84 = 0; - this->m_unk88 = 0; - this->m_unk8c = -1; - this->m_unk98 = 0; - this->m_unk90 = 0x80000000; + this->m_unk0x7c = 0; + this->m_unk0x80 = 0; + this->m_unk0x84 = 0; + this->m_unk0x88 = 0; + this->m_unk0x8c = -1; + this->m_unk0x98 = 0; + this->m_unk0x90 = 0x80000000; } // FUNCTION: LEGO1 0x10038100 diff --git a/LEGO1/pizza.h b/LEGO1/pizza.h index 477a48cf..f1ac9f45 100644 --- a/LEGO1/pizza.h +++ b/LEGO1/pizza.h @@ -31,15 +31,15 @@ class Pizza : public IsleActor { } private: - undefined4 m_unk78; - undefined4 m_unk7c; - undefined4 m_unk80; - undefined4 m_unk84; - undefined4 m_unk88; - undefined4 m_unk8c; - undefined4 m_unk90; - undefined4 m_unk94; - undefined m_unk98; + undefined4 m_unk0x78; + undefined4 m_unk0x7c; + undefined4 m_unk0x80; + undefined4 m_unk0x84; + undefined4 m_unk0x88; + undefined4 m_unk0x8c; + undefined4 m_unk0x90; + undefined4 m_unk0x94; + undefined m_unk0x98; }; #endif // PIZZA_H diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/pizzamissionstate.h index c44eacb0..19b178d1 100644 --- a/LEGO1/pizzamissionstate.h +++ b/LEGO1/pizzamissionstate.h @@ -5,11 +5,11 @@ struct PizzaMissionStateEntry { public: - undefined2 m_unk0; + undefined2 m_unk0x0; MxU8 m_id; - undefined m_unk3[0x15]; + undefined m_unk0x3[0x15]; MxU16 m_color; - undefined m_unk18[6]; + undefined m_unk0x18[6]; }; // VTABLE: LEGO1 0x100d7408 @@ -34,8 +34,8 @@ class PizzaMissionState : public LegoState { PizzaMissionStateEntry* GetState(MxU8 id); protected: - undefined4 m_unk8; - undefined4 m_unkc; + undefined4 m_unk0x8; + undefined4 m_unk0xc; PizzaMissionStateEntry m_state[5]; }; diff --git a/LEGO1/racecar.cpp b/LEGO1/racecar.cpp index 207c02c9..0fbc97b9 100644 --- a/LEGO1/racecar.cpp +++ b/LEGO1/racecar.cpp @@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(RaceCar, 0x164); // FUNCTION: LEGO1 0x10028200 RaceCar::RaceCar() { - this->m_unk13c = 40.0; + this->m_unk0x13c = 40.0; } // STUB: LEGO1 0x10028420 diff --git a/LEGO1/racecar.h b/LEGO1/racecar.h index 181b715f..b0db77c5 100644 --- a/LEGO1/racecar.h +++ b/LEGO1/racecar.h @@ -26,7 +26,7 @@ class RaceCar : public IslePathActor { private: // TODO: RaceCar fields - undefined m_unk160[4]; + undefined m_unk0x160[4]; }; #endif // RACECAR_H diff --git a/LEGO1/racestate.h b/LEGO1/racestate.h index 28c58bec..ea52e49d 100644 --- a/LEGO1/racestate.h +++ b/LEGO1/racestate.h @@ -6,8 +6,8 @@ struct RaceStateEntry { public: MxU8 m_id; - undefined m_unk1[1]; - MxU16 m_unk2; + undefined m_unk0x1[1]; + MxU16 m_unk0x2; MxU16 m_color; }; @@ -37,8 +37,8 @@ class RaceState : public LegoState { protected: RaceStateEntry m_state[5]; - undefined2 m_unk26[2]; - undefined4 m_unk28; + undefined2 m_unk0x26[2]; + undefined4 m_unk0x28; }; #endif // RACESTATE_H diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h index bb14815b..ddc93103 100644 --- a/LEGO1/realtime/orientableroi.h +++ b/LEGO1/realtime/orientableroi.h @@ -37,13 +37,13 @@ class OrientableROI : public ROI { virtual void UpdateWorldVelocity(); protected: - char m_unkc; + char m_unk0xc; Matrix4Data m_local2world; // 0x10 BoundingBox m_world_bounding_box; // 0x58 BoundingSphere m_world_bounding_sphere; // 0xa8 Vector3Data m_world_velocity; // 0xc0 - unsigned int m_unkd4; - unsigned int m_unkd8; + unsigned int m_unk0xd4; + unsigned int m_unk0xd8; }; #endif // ORIENTABLEROI_H diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h index 40cff140..223d5326 100644 --- a/LEGO1/realtime/roi.h +++ b/LEGO1/realtime/roi.h @@ -22,8 +22,8 @@ class BoundingBox { private: Vector3Data min; Vector3Data max; - Vector3Data m_unk28; - Vector3Data m_unk3c; + Vector3Data m_unk0x28; + Vector3Data m_unk0x3c; }; /* diff --git a/LEGO1/score.cpp b/LEGO1/score.cpp index d3c48829..bc642dc6 100644 --- a/LEGO1/score.cpp +++ b/LEGO1/score.cpp @@ -18,7 +18,7 @@ DECOMP_SIZE_ASSERT(Score, 0x104) // FUNCTION: LEGO1 0x10001000 Score::Score() { - m_unkf8 = 0; + m_unk0xf8 = 0; NotificationManager()->Register(this); } @@ -76,7 +76,7 @@ MxLong Score::Notify(MxParam& p_param) { MxLong ret = 0; LegoWorld::Notify(p_param); - if (m_unkf6) { + if (m_unk0xf6) { switch (((MxNotificationParam&) p_param).GetNotification()) { case c_notificationStartAction: ret = 1; @@ -95,8 +95,8 @@ MxLong Score::Notify(MxParam& p_param) break; case MXTRANSITIONMANAGER_TRANSITIONENDED: DeleteObjects(g_infoscorScript, 7, 9); - if (m_unkf8) - GameState()->HandleAction(m_unkf8); + if (m_unk0xf8) + GameState()->HandleAction(m_unk0xf8); ret = 1; break; default: @@ -115,7 +115,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p) MxU32 id = action->GetObjectId(); switch (action->GetObjectId()) { case 10: - m_unkf8 = 0x38; + m_unk0xf8 = 0x38; TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0); break; case 0x1f5: @@ -158,12 +158,12 @@ MxLong Score::FUN_100016d0(MxType17NotificationParam& p) if (l == 1 || p.GetUnknown20() == 4) { switch (p.GetUnknown20()) { case 1: - m_unkf8 = 2; + m_unk0xf8 = 2; DeleteScript(); TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0); break; case 2: - m_unkf8 = 3; + m_unk0xf8 = 3; DeleteScript(); TransitionManager()->StartTransition(MxTransitionManager::PIXELATION, 0x32, 0, 0); break; @@ -320,6 +320,6 @@ void Score::FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color) MxBool Score::VTable0x64() { DeleteScript(); - m_unkf8 = 2; + m_unk0xf8 = 2; return TRUE; } diff --git a/LEGO1/score.h b/LEGO1/score.h index c5eb8f70..35ee8b1d 100644 --- a/LEGO1/score.h +++ b/LEGO1/score.h @@ -43,7 +43,7 @@ class Score : public LegoWorld { void FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color); protected: - undefined4 m_unkf8; + undefined4 m_unk0xf8; ScoreState* m_state; MxU8* m_surface; diff --git a/LEGO1/skateboard.cpp b/LEGO1/skateboard.cpp index 19dfd02b..96a26bcd 100644 --- a/LEGO1/skateboard.cpp +++ b/LEGO1/skateboard.cpp @@ -9,10 +9,10 @@ DECOMP_SIZE_ASSERT(SkateBoard, 0x168); // FUNCTION: LEGO1 0x1000fd40 SkateBoard::SkateBoard() { - this->m_unk160 = 0; - this->m_unk13c = 15.0; - this->m_unk150 = 3.5; - this->m_unk148 = 1; + this->m_unk0x160 = 0; + this->m_unk0x13c = 15.0; + this->m_unk0x150 = 3.5; + this->m_unk0x148 = 1; NotificationManager()->Register(this); } diff --git a/LEGO1/skateboard.h b/LEGO1/skateboard.h index 781fad91..671c7f86 100644 --- a/LEGO1/skateboard.h +++ b/LEGO1/skateboard.h @@ -25,8 +25,8 @@ class SkateBoard : public IslePathActor { private: // TODO: SkateBoard types - undefined m_unk160; - undefined m_unk161[0x7]; + undefined m_unk0x160; + undefined m_unk0x161[0x7]; }; #endif // SKATEBOARD_H diff --git a/LEGO1/towtrack.cpp b/LEGO1/towtrack.cpp index 9117d88b..3fd0d84d 100644 --- a/LEGO1/towtrack.cpp +++ b/LEGO1/towtrack.cpp @@ -5,13 +5,13 @@ DECOMP_SIZE_ASSERT(TowTrack, 0x180); // FUNCTION: LEGO1 0x1004c720 TowTrack::TowTrack() { - this->m_unk168 = 0; - this->m_unk16a = -1; - this->m_unk164 = 0; - this->m_unk16c = 0; - this->m_unk170 = -1; - this->m_unk16e = 0; - this->m_unk174 = -1; - this->m_unk13c = 40.0; - this->m_unk178 = 1.0; + this->m_unk0x168 = 0; + this->m_unk0x16a = -1; + this->m_unk0x164 = 0; + this->m_unk0x16c = 0; + this->m_unk0x170 = -1; + this->m_unk0x16e = 0; + this->m_unk0x174 = -1; + this->m_unk0x13c = 40.0; + this->m_unk0x178 = 1.0; } diff --git a/LEGO1/towtrack.h b/LEGO1/towtrack.h index 90e5b244..2243f9a2 100644 --- a/LEGO1/towtrack.h +++ b/LEGO1/towtrack.h @@ -25,16 +25,16 @@ class TowTrack : public IslePathActor { private: // TODO: TowTrack field types - undefined m_unk154[4]; - MxS32 m_unk164; - MxS16 m_unk168; - MxS16 m_unk16a; - MxS16 m_unk16c; - MxS16 m_unk16e; - MxS32 m_unk170; - MxS32 m_unk174; - MxFloat m_unk178; - undefined4 m_unk17c; + undefined m_unk0x154[4]; + MxS32 m_unk0x164; + MxS16 m_unk0x168; + MxS16 m_unk0x16a; + MxS16 m_unk0x16c; + MxS16 m_unk0x16e; + MxS32 m_unk0x170; + MxS32 m_unk0x174; + MxFloat m_unk0x178; + undefined4 m_unk0x17c; }; #endif // TOWTRACK_H diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/towtrackmissionstate.h index 701210e8..1ef42b05 100644 --- a/LEGO1/towtrackmissionstate.h +++ b/LEGO1/towtrackmissionstate.h @@ -41,7 +41,7 @@ class TowTrackMissionState : public LegoState { } protected: - undefined m_unk8[0x14]; + undefined m_unk0x8[0x14]; MxU16 m_color1; MxU16 m_color2; MxU16 m_color3; diff --git a/tools/README.md b/tools/README.md index 91f61d8b..75d9b0a5 100644 --- a/tools/README.md +++ b/tools/README.md @@ -106,10 +106,10 @@ Member variables should be annotated with their relative offsets. ``` class MxDSObject : public MxCore { private: - MxU32 m_sizeOnDisk; // 0x8 - MxU16 m_type; // 0xc - char* m_sourceName; // 0x10 - undefined4 m_unk14; // 0x14 + MxU32 m_sizeOnDisk; // 0x8 + MxU16 m_type; // 0xc + char* m_sourceName; // 0x10 + undefined4 m_unk0x14; // 0x14 ``` ## Global variables (**WIP**)