isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 08:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix m_unk0x pattern

Browse Source
This commit is contained in:
Christian Semmler 2023-12-12 06:19:58 -05:00
parent d511461bb0
commit 21d33bdb0a
116 changed files with 579 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ISLE/isleapp.cpp
View File

@ -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

2
ISLE/isleapp.h
View File

@ -50,7 +50,7 @@ class IsleApp {
// 20
BOOL m_using16bit;
int m_unk24;
int m_unk0x24;
BOOL m_use3dSound;
BOOL m_useMusic;

8
LEGO1/act3.h
View File

@ -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

4
LEGO1/act3state.h
View File

@ -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

22
LEGO1/ambulance.cpp
View File

@ -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;
}

24
LEGO1/ambulance.h
View File

@ -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

2
LEGO1/ambulancemissionstate.h
View File

@ -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;

6
LEGO1/bike.cpp
View File

@ -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;
}

2
LEGO1/bike.h
View File

@ -25,7 +25,7 @@ class Bike : public IslePathActor {
private:
// TODO: Bike fields
undefined m_unk160[4];
undefined m_unk0x160[4];
};
#endif // BIKE_H

4
LEGO1/dunebuggy.cpp
View File

@ -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;
}

6
LEGO1/dunebuggy.h
View File

@ -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

2
LEGO1/gifmanager.cpp
View File

@ -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) {

16
LEGO1/gifmanager.h
View File

@ -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

22
LEGO1/helicopter.cpp
View File

@ -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);
}

14
LEGO1/helicopter.h
View File

@ -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();

4
LEGO1/helicopterstate.h
View File

@ -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

6
LEGO1/islepathactor.cpp
View File

@ -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

4
LEGO1/islepathactor.h
View File

@ -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

6
LEGO1/jetski.cpp
View File

@ -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;
}

2
LEGO1/jetski.h
View File

@ -25,7 +25,7 @@ class Jetski : public IslePathActor {
private:
// TODO: Jetski fields
undefined m_unk160[4];
undefined m_unk0x160[4];
};
#endif // JETSKI_H

4
LEGO1/lego3dmanager.h
View File

@ -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;
};

22
LEGO1/legoactor.cpp
View File

@ -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;
}

8
LEGO1/legoactor.h
View File

@ -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

6
LEGO1/legoentity.cpp
View File

@ -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

6
LEGO1/legoentity.h
View File

@ -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

4
LEGO1/legoentitypresenter.cpp
View File

@ -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;
}

2
LEGO1/legoentitypresenter.h
View File

@ -30,7 +30,7 @@ class LegoEntityPresenter : public MxCompositePresenter {
private:
void Destroy(MxBool p_fromDestructor);
undefined4 m_unk4c;
undefined4 m_unk0x4c;
};
#endif // LEGOENTITYPRESENTER_H

4
LEGO1/legoeventnotificationparam.h
View File

@ -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

8
LEGO1/legogamestate.cpp
View File

@ -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;
}

18
LEGO1/legogamestate.h
View File

@ -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);

10
LEGO1/legonavcontroller.cpp
View File

@ -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();

12
LEGO1/legonavcontroller.h
View File

@ -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

12
LEGO1/legoomni.cpp
View File

@ -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();

10
LEGO1/legoomni.h
View File

@ -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();

12
LEGO1/legopathactor.h
View File

@ -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

8
LEGO1/legophonemepresenter.cpp
View File

@ -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;
}

8
LEGO1/legophonemepresenter.h
View File

@ -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

30
LEGO1/legorace.cpp
View File

@ -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);
}

32
LEGO1/legorace.h
View File

@ -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

4
LEGO1/legoroi.cpp
View File

@ -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++;

14
LEGO1/legovehiclebuildstate.cpp
View File

@ -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;
}

16
LEGO1/legovehiclebuildstate.h
View File

@ -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
};

10
LEGO1/legovideomanager.cpp
View File

@ -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;
}

8
LEGO1/legovideomanager.h
View File

@ -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

8
LEGO1/legoworld.h
View File

@ -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);

2
LEGO1/legoworldpresenter.cpp
View File

@ -12,7 +12,7 @@ void LegoWorldPresenter::configureLegoWorldPresenter(int p_quality)
// FUNCTION: LEGO1 0x100665c0
LegoWorldPresenter::LegoWorldPresenter()
{
m_unk50 = 50000;
m_unk0x50 = 50000;
}
// STUB: LEGO1 0x10066770

2
LEGO1/legoworldpresenter.h
View File

@ -26,7 +26,7 @@ class LegoWorldPresenter : public LegoEntityPresenter {
}
private:
undefined4 m_unk50;
undefined4 m_unk0x50;
};
#endif // LEGOWORLDPRESENTER_H

8
LEGO1/motorcycle.cpp
View File

@ -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;
}

6
LEGO1/motorcycle.h
View File

@ -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

138
LEGO1/mxbackgroundaudiomanager.cpp
View File

@ -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;
}

10
LEGO1/mxbackgroundaudiomanager.h
View File

@ -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;
};

16
LEGO1/mxcontrolpresenter.cpp
View File

@ -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;
}
}

12
LEGO1/mxcontrolpresenter.h
View File

@ -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

6
LEGO1/mxdirect3d.cpp
View File

@ -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;
}

16
LEGO1/mxdirect3d.h
View File

@ -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);

2
LEGO1/mxdiskstreamcontroller.cpp
View File

@ -10,7 +10,7 @@ DECOMP_SIZE_ASSERT(MxDiskStreamController, 0xc8);
// FUNCTION: LEGO1 0x100c7120
MxDiskStreamController::MxDiskStreamController()
{
m_unk8c = 0;
m_unk0x8c = 0;
}
// TEMPLATE: LEGO1 0x100c7330

6
LEGO1/mxdiskstreamcontroller.h
View File

@ -40,14 +40,14 @@ class MxDiskStreamController : public MxStreamController {
private:
MxStreamListMxDSAction m_list0x64; // 0x64
undefined m_unk70; // 0x70
undefined m_unk0x70; // 0x70
list<MxDSBuffer*> 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

4
LEGO1/mxdiskstreamprovider.cpp
View File

@ -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;

2
LEGO1/mxdiskstreamprovider.h
View File

@ -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
};

18
LEGO1/mxdsaction.cpp
View File

@ -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

30
LEGO1/mxdsaction.h
View File

@ -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

4
LEGO1/mxdsactionlist.h
View File

@ -16,14 +16,14 @@ class MxDSAction;
// SIZE 0x1c
class MxDSActionList : public MxList<MxDSAction*> {
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

14
LEGO1/mxdsbuffer.cpp
View File

@ -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

10
LEGO1/mxdsbuffer.h
View File

@ -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

2
LEGO1/mxdschunk.cpp
View File

@ -7,7 +7,7 @@ MxDSChunk::MxDSChunk()
{
m_flags = 0;
m_data = NULL;
m_unk0c = -1;
m_unk0x0c = -1;
m_time = 0;
m_length = 0;
}

10
LEGO1/mxdschunk.h
View File

@ -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

12
LEGO1/mxdsmediaaction.cpp
View File

@ -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);

8
LEGO1/mxdsmediaaction.h
View File

@ -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

2
LEGO1/mxdsmultiaction.cpp
View File

@ -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;

16
LEGO1/mxdsobject.cpp
View File

@ -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

22
LEGO1/mxdsobject.h
View File

@ -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);

36
LEGO1/mxdsstreamingaction.cpp
View File

@ -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;
}

12
LEGO1/mxdsstreamingaction.h
View File

@ -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;
};

4
LEGO1/mxloopingflcpresenter.cpp
View File

@ -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);

2
LEGO1/mxloopingflcpresenter.h
View File

@ -24,7 +24,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
void Init();
void Destroy(MxBool p_fromDestructor);
undefined4 m_unk68;
undefined4 m_unk0x68;
};
#endif // MXLOOPINGFLCPRESENTER_H

2
LEGO1/mxloopingsmkpresenter.cpp
View File

@ -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;
}

2
LEGO1/mxloopingsmkpresenter.h
View File

@ -22,7 +22,7 @@ class MxLoopingSmkPresenter : public MxSmkPresenter {
void Init();
void Destroy(MxBool p_fromDestructor);
undefined4 m_unk720;
undefined4 m_unk0x720;
};
#endif // MXLOOPINGSMKPRESENTER_H

10
LEGO1/mxmusicmanager.cpp
View File

@ -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;
}

10
LEGO1/mxmusicmanager.h
View File

@ -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

6
LEGO1/mxnextactiondatastart.h
View File

@ -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;
};

2
LEGO1/mxnotificationmanager.cpp
View File

@ -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;

2
LEGO1/mxnotificationmanager.h
View File

@ -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

2
LEGO1/mxsoundmanager.h
View File

@ -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

4
LEGO1/mxstillpresenter.cpp
View File

@ -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;

4
LEGO1/mxstreamchunk.h
View File

@ -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

6
LEGO1/mxstreamcontroller.cpp
View File

@ -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;

6
LEGO1/mxstreamcontroller.h
View File

@ -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
};

2
LEGO1/mxstreamer.cpp
View File

@ -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;
}

4
LEGO1/mxstreamer.h
View File

@ -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 {

4
LEGO1/mxtransitionmanager.cpp
View File

@ -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

4
LEGO1/mxtransitionmanager.h
View File

@ -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;

12
LEGO1/mxtype17notificationparam.h
View File

@ -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

8
LEGO1/mxvideomanager.cpp
View File

@ -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;

2
LEGO1/mxvideomanager.h
View File

@ -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

8
LEGO1/mxvideoparam.cpp
View File

@ -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;

2
LEGO1/mxvideoparam.h
View File

@ -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
};

28
LEGO1/mxvideopresenter.cpp
View File

@ -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;
}

12
LEGO1/mxvideopresenter.h
View File

@ -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

4
LEGO1/mxwavepresenter.cpp
View File

@ -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;

2
LEGO1/mxwavepresenter.h
View File

@ -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
};

Some files were not shown because too many files have changed in this diff Show More