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

style

Browse Source
This commit is contained in:
Christian Semmler 2024-04-06 07:31:00 -04:00
parent 7c8bb8345e
commit 94101ebb97
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
LEGO1/lego/legoomni/src/worlds/gasstation.cpp
View File

@ -125,7 +125,7 @@ void GasStation::ReadyWorld()
m_currentActorId = CurrentActor()->GetActorId(); m_currentActorId = CurrentActor()->GetActorId();
switch (m_currentActorId) { switch (m_currentActorId) {
case 1: { case 1:
switch (m_state->m_unk0x18) { switch (m_state->m_unk0x18) {
case 0: case 0:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
@ -153,9 +153,10 @@ void GasStation::ReadyWorld()
if (m_state->m_unk0x18 < 5) { if (m_state->m_unk0x18 < 5) {
m_state->m_unk0x18++; m_state->m_unk0x18++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} case 2:
case 2: {
switch (m_state->m_unk0x1a) { switch (m_state->m_unk0x1a) {
case 0: case 0:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
@ -178,9 +179,10 @@ void GasStation::ReadyWorld()
if (m_state->m_unk0x1a < 5) { if (m_state->m_unk0x1a < 5) {
m_state->m_unk0x1a++; m_state->m_unk0x1a++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} case 3:
case 3: {
switch (m_state->m_unk0x1c) { switch (m_state->m_unk0x1c) {
case 0: case 0:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
@ -203,9 +205,10 @@ void GasStation::ReadyWorld()
if (m_state->m_unk0x1c < 5) { if (m_state->m_unk0x1c < 5) {
m_state->m_unk0x1c++; m_state->m_unk0x1c++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} case 4:
case 4: {
switch (m_state->m_unk0x1e) { switch (m_state->m_unk0x1e) {
case 0: case 0:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
@ -228,9 +231,10 @@ void GasStation::ReadyWorld()
if (m_state->m_unk0x1e < 5) { if (m_state->m_unk0x1e < 5) {
m_state->m_unk0x1e++; m_state->m_unk0x1e++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} case 5:
case 5: {
switch (m_state->m_unk0x20) { switch (m_state->m_unk0x20) {
case 0: case 0:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
@ -253,11 +257,13 @@ void GasStation::ReadyWorld()
if (m_state->m_unk0x20 < 5) { if (m_state->m_unk0x20 < 5) {
m_state->m_unk0x20++; m_state->m_unk0x20++;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break;
default:
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
break; break;
} }
}
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10005590 // FUNCTION: LEGO1 0x10005590

15
LEGO1/omni/include/mxdsobject.h
View File

@ -44,9 +44,12 @@ class MxDSObject : public MxCore {
return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name); return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
} // vtable+10; } // vtable+10;
virtual undefined4 VTable0x14(); // vtable+14; virtual undefined4 VTable0x14(); // vtable+14;
virtual MxU32 GetSizeOnDisk(); // vtable+18; virtual MxU32 GetSizeOnDisk(); // vtable+18;
virtual void Deserialize(MxU8*& p_source, MxS16 p_unk0x24); // vtable+1c; virtual void Deserialize(MxU8*& p_source, MxS16 p_unk0x24); // vtable+1c;
// FUNCTION: ISLE 0x401c40
// FUNCTION: LEGO1 0x10005530
inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20; inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20;
inline Type GetType() const { return (Type) this->m_type; } inline Type GetType() const { return (Type) this->m_type; }
@ -81,10 +84,4 @@ class MxDSObject : public MxCore {
MxDSObject* DeserializeDSObjectDispatch(MxU8*&, MxS16); MxDSObject* DeserializeDSObjectDispatch(MxU8*&, MxS16);
// FUNCTION: ISLE 0x401c40
// MxDSObject::SetAtomId
// FUNCTION: LEGO1 0x10005530
// MxDSObject::SetAtomId
#endif // MXDSOBJECT_H #endif // MXDSOBJECT_H