diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h index ddae7435..3a722a2f 100644 --- a/LEGO1/lego/legoomni/include/legocarbuild.h +++ b/LEGO1/lego/legoomni/include/legocarbuild.h @@ -80,19 +80,24 @@ class LegoCarBuild : public LegoWorld { return !strcmp(p_name, LegoCarBuild::ClassName()) || LegoWorld::IsA(p_name); } - MxLong Notify(MxParam& p_param) override; // vtable+0x04 - MxResult Tickle() override; // vtable+0x08 - MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 - void ReadyWorld() override; // vtable+0x50 - MxBool VTable0x5c() override; // vtable+0x5c - MxBool Escape() override; // vtable+0x64 - void Enable(MxBool p_enable) override; // vtable+0x68 - virtual void VTable0x6c(); // vtable+0x6c - virtual void VTable0x70(); // vtable+0x70 - virtual void VTable0x74(MxFloat param_1[3], MxFloat param_2[3]); // vtable+0x74 - virtual void VTable0x78(MxFloat param_1[3], MxFloat param_2[3]); // vtable+0x78 - virtual void VTable0x7c(MxFloat param_1[3], MxFloat param_2[3]); // vtable+0x7c - virtual void VTable0x80(MxFloat param_1[2], MxFloat param_2[2], MxFloat param_3, MxFloat param_4[2]); // vtable+0x80 + MxLong Notify(MxParam& p_param) override; // vtable+0x04 + MxResult Tickle() override; // vtable+0x08 + MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 + void ReadyWorld() override; // vtable+0x50 + MxBool VTable0x5c() override; // vtable+0x5c + MxBool Escape() override; // vtable+0x64 + void Enable(MxBool p_enable) override; // vtable+0x68 + virtual void VTable0x6c(); // vtable+0x6c + virtual void VTable0x70(); // vtable+0x70 + virtual void VTable0x74(MxFloat p_param1[3], MxFloat p_param2[3]); // vtable+0x74 + virtual void VTable0x78(MxFloat p_param1[3], MxFloat p_param2[3]); // vtable+0x78 + virtual void VTable0x7c(MxFloat p_param1[3], MxFloat p_param2[3]); // vtable+0x7c + virtual void VTable0x80( + MxFloat p_param1[2], + MxFloat p_param2[2], + MxFloat p_param3, + MxFloat p_param4[2] + ); // vtable+0x80 void InitPresenters(); void FUN_10022f30(); @@ -100,10 +105,10 @@ class LegoCarBuild : public LegoWorld { void FUN_10024f50(); void SetPresentersEnabled(MxBool p_enabled); void TogglePresentersEnabled(); - undefined4 FUN_10025720(undefined4 param_1); + undefined4 FUN_10025720(undefined4 p_param1); MxS32 FUN_10025d70(); - void FUN_10025db0(const char* param_1, undefined4 param_2); - MxS32 FUN_10025ee0(undefined4 param_1); + void FUN_10025db0(const char* p_param1, undefined4 p_param2); + MxS32 FUN_10025ee0(undefined4 p_param1); // SYNTHETIC: LEGO1 0x10022a60 // LegoCarBuild::`scalar deleting destructor' @@ -143,10 +148,10 @@ class LegoCarBuild : public LegoWorld { MxStillPresenter* m_colorBookBitmap; // 0x2dc MxControlPresenter* m_yellowCtl; // 0x2e0 MxControlPresenter* m_redCtl; // 0x2e4 - MxControlPresenter* m_BlueCtl; // 0x2e8 - MxControlPresenter* m_GreenCtl; // 0x2ec - MxControlPresenter* m_GrayCtl; // 0x2f0 - MxControlPresenter* m_BlackCtl; // 0x2f4 + MxControlPresenter* m_blueCtl; // 0x2e8 + MxControlPresenter* m_greenCtl; // 0x2ec + MxControlPresenter* m_grayCtl; // 0x2f0 + MxControlPresenter* m_blackCtl; // 0x2f4 MxSoundPresenter* m_shelfSound; // 0x2f8 MxSoundPresenter* m_placeBrickSound; // 0x2fc MxSoundPresenter* m_getBrickSound; // 0x300 diff --git a/LEGO1/lego/legoomni/include/legocarbuildpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildpresenter.h index a965da41..8c97666c 100644 --- a/LEGO1/lego/legoomni/include/legocarbuildpresenter.h +++ b/LEGO1/lego/legoomni/include/legocarbuildpresenter.h @@ -37,8 +37,8 @@ class LegoCarBuildAnimPresenter : public LegoAnimPresenter { void EndAction() override; // vtable+0x40 void PutFrame() override; // vtable+0x6c - void FUN_10079920(float param_1); - MxBool FUN_10079ca0(const char* param_1); + void FUN_10079920(float p_param1); + MxBool FUN_10079ca0(const char* p_param1); // SYNTHETIC: LEGO1 0x10078660 // LegoCarBuildAnimPresenter::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h index 21776f1b..edd379dd 100644 --- a/LEGO1/lego/legoomni/include/legoutils.h +++ b/LEGO1/lego/legoomni/include/legoutils.h @@ -39,9 +39,9 @@ extern MxAtomId* g_isleScript; LegoEntity* PickEntity(MxLong, MxLong); LegoROI* PickROI(MxLong, MxLong); LegoROI* PickParentROI(MxLong p_a, MxLong p_b); -void FUN_1003dde0(LegoROI* param_1, float param_2); -MxBool FUN_1003ded0(float param_1[3], float param_2[3], float param_3[3]); -MxBool TransformWorldToScreen(const float world[3], float screen[4]); +void FUN_1003dde0(LegoROI* p_param1, MxFloat p_param2); +MxBool FUN_1003ded0(MxFloat p_param1[3], MxFloat p_param2[3], MxFloat p_param3[3]); +MxBool TransformWorldToScreen(const MxFloat world[3], MxFloat screen[4]); MxS16 CountTotalTreeNodes(LegoTreeNode* p_node); void FUN_1003e050(LegoAnimPresenter* p_presenter); Extra::ActionType MatchActionString(const char*); diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index abd1b88b..50c4b3b9 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -41,10 +41,10 @@ LegoCarBuild::LegoCarBuild() m_colorBookBitmap = 0; m_yellowCtl = 0; m_redCtl = 0; - m_BlueCtl = 0; - m_GreenCtl = 0; - m_GrayCtl = 0; - m_BlackCtl = 0; + m_blueCtl = 0; + m_greenCtl = 0; + m_grayCtl = 0; + m_blackCtl = 0; m_shelfSound = 0; m_placeBrickSound = 0; m_getBrickSound = 0; @@ -157,10 +157,10 @@ void LegoCarBuild::InitPresenters() m_colorBookBitmap = (MxStillPresenter*) Find("MxStillPresenter", "ColorBook_Bitmap"); m_yellowCtl = (MxControlPresenter*) Find("MxControlPresenter", "Yellow_Ctl"); m_redCtl = (MxControlPresenter*) Find("MxControlPresenter", "Red_Ctl"); - m_BlueCtl = (MxControlPresenter*) Find("MxControlPresenter", "Blue_Ctl"); - m_GreenCtl = (MxControlPresenter*) Find("MxControlPresenter", "Green_Ctl"); - m_GrayCtl = (MxControlPresenter*) Find("MxControlPresenter", "Gray_Ctl"); - m_BlackCtl = (MxControlPresenter*) Find("MxControlPresenter", "Black_Ctl"); + m_blueCtl = (MxControlPresenter*) Find("MxControlPresenter", "Blue_Ctl"); + m_greenCtl = (MxControlPresenter*) Find("MxControlPresenter", "Green_Ctl"); + m_grayCtl = (MxControlPresenter*) Find("MxControlPresenter", "Gray_Ctl"); + m_blackCtl = (MxControlPresenter*) Find("MxControlPresenter", "Black_Ctl"); m_shelfSound = (MxSoundPresenter*) Find("MxSoundPresenter", "Shelf_Sound"); m_placeBrickSound = (MxSoundPresenter*) Find("MxSoundPresenter", "PlaceBrick_Sound"); m_getBrickSound = (MxSoundPresenter*) Find("MxSoundPresenter", "GetBrick_Sound"); @@ -233,64 +233,64 @@ void LegoCarBuild::VTable0x70() // FUNCTION: LEGO1 0x10023500 // FUNCTION: BETA10 0x1006bdf6 -void LegoCarBuild::VTable0x74(MxFloat param_1[3], MxFloat param_2[3]) +void LegoCarBuild::VTable0x74(MxFloat p_param1[3], MxFloat p_param2[3]) { MxFloat fVar1; MxFloat local_20[3]; MxFloat local_14[3]; - FUN_1003ded0(param_1, local_14, local_20); + FUN_1003ded0(p_param1, local_14, local_20); fVar1 = (m_unk0x2a4[2] - local_20[2]) / local_14[2]; - param_2[0] = (fVar1 * local_14[0] + local_20[0]) - m_unk0x2a4[0]; - param_2[1] = (fVar1 * local_14[1] + local_20[1]) - m_unk0x2a4[1]; - param_2[2] = 0.0; + p_param2[0] = (fVar1 * local_14[0] + local_20[0]) - m_unk0x2a4[0]; + p_param2[1] = (fVar1 * local_14[1] + local_20[1]) - m_unk0x2a4[1]; + p_param2[2] = 0.0; return; } // FUNCTION: LEGO1 0x10023570 // FUNCTION: BETA10 0x1006be91 -void LegoCarBuild::VTable0x78(MxFloat param_1[3], MxFloat param_2[3]) +void LegoCarBuild::VTable0x78(MxFloat p_param1[3], MxFloat p_param2[3]) { MxFloat fVar1; MxFloat local_18[3]; MxFloat local_c[3]; - FUN_1003ded0(param_1, local_18, local_c); + FUN_1003ded0(p_param1, local_18, local_c); - param_2[2] = - m_unk0x2a4[2] + (m_unk0x2bc[2] - m_unk0x2a4[2]) * ((param_1[1] - m_unk0x294) / (m_unk0x29c - m_unk0x294)); - fVar1 = (param_2[2] - local_c[2]) / local_18[2]; - param_2[0] = fVar1 * local_18[0] - m_unk0x2a4[0] + local_c[0]; - param_2[1] = fVar1 * local_18[1] - m_unk0x2a4[1] + local_c[1]; - param_2[2] = param_2[2] - m_unk0x2a4[2]; + p_param2[2] = + m_unk0x2a4[2] + (m_unk0x2bc[2] - m_unk0x2a4[2]) * ((p_param1[1] - m_unk0x294) / (m_unk0x29c - m_unk0x294)); + fVar1 = (p_param2[2] - local_c[2]) / local_18[2]; + p_param2[0] = fVar1 * local_18[0] - m_unk0x2a4[0] + local_c[0]; + p_param2[1] = fVar1 * local_18[1] - m_unk0x2a4[1] + local_c[1]; + p_param2[2] = p_param2[2] - m_unk0x2a4[2]; } // FUNCTION: LEGO1 0x10023620 // FUNCTION: BETA10 0x1006bfb5 -void LegoCarBuild::VTable0x7c(MxFloat param_1[3], MxFloat param_2[3]) +void LegoCarBuild::VTable0x7c(MxFloat p_param1[3], MxFloat p_param2[3]) { MxFloat local_18[3]; MxFloat local_c[3]; - FUN_1003ded0(param_1, local_18, local_c); + FUN_1003ded0(p_param1, local_18, local_c); MxFloat fVar1 = (m_unk0x2bc[1] - local_c[1]) / local_18[1]; - param_2[0] = fVar1 * local_18[0] - m_unk0x2a4[0] + local_c[0]; - param_2[1] = m_unk0x2bc[1] - m_unk0x2a4[1]; - param_2[2] = fVar1 * local_18[2] - m_unk0x2a4[2] + local_c[2]; + p_param2[0] = fVar1 * local_18[0] - m_unk0x2a4[0] + local_c[0]; + p_param2[1] = m_unk0x2bc[1] - m_unk0x2a4[1]; + p_param2[2] = fVar1 * local_18[2] - m_unk0x2a4[2] + local_c[2]; } // FUNCTION: LEGO1 0x100236a0 // FUNCTION: BETA10 0x100701f0 -void LegoCarBuild::VTable0x80(MxFloat param_1[2], MxFloat param_2[2], MxFloat param_3, MxFloat param_4[2]) +void LegoCarBuild::VTable0x80(MxFloat p_param1[2], MxFloat p_param2[2], MxFloat p_param3, MxFloat p_param4[2]) { // The code does the right thing and matches BETA10 perfectly, but mismatches LEGO1. // Maybe compiler entropy? - if (param_1[1] == 0.0f) { + if (p_param1[1] == 0.0f) { return; } - param_4[0] = ((param_3 - param_2[1]) / param_1[1]) * param_1[0] + param_2[0]; - param_4[1] = param_3; + p_param4[0] = ((p_param3 - p_param2[1]) / p_param1[1]) * p_param1[0] + p_param2[0]; + p_param4[1] = p_param3; } #define LEGOCARBUILD_TICKLE_CASE(subtract, start, end, str) \ @@ -469,10 +469,10 @@ void LegoCarBuild::SetPresentersEnabled(MxBool p_enabled) m_colorBookBitmap->Enable(p_enabled); m_yellowCtl->Enable(p_enabled); m_redCtl->Enable(p_enabled); - m_BlueCtl->Enable(p_enabled); - m_GreenCtl->Enable(p_enabled); - m_GrayCtl->Enable(p_enabled); - m_BlackCtl->Enable(p_enabled); + m_blueCtl->Enable(p_enabled); + m_greenCtl->Enable(p_enabled); + m_grayCtl->Enable(p_enabled); + m_blackCtl->Enable(p_enabled); } // FUNCTION: LEGO1 0x10025010 @@ -481,10 +481,10 @@ void LegoCarBuild::TogglePresentersEnabled() m_colorBookBitmap->Enable(!m_colorBookBitmap->IsEnabled()); m_yellowCtl->Enable(!m_yellowCtl->IsEnabled()); m_redCtl->Enable(!m_redCtl->IsEnabled()); - m_BlueCtl->Enable(!m_BlueCtl->IsEnabled()); - m_GreenCtl->Enable(!m_GreenCtl->IsEnabled()); - m_GrayCtl->Enable(!m_GrayCtl->IsEnabled()); - m_BlackCtl->Enable(!m_BlackCtl->IsEnabled()); + m_blueCtl->Enable(!m_blueCtl->IsEnabled()); + m_greenCtl->Enable(!m_greenCtl->IsEnabled()); + m_grayCtl->Enable(!m_grayCtl->IsEnabled()); + m_blackCtl->Enable(!m_blackCtl->IsEnabled()); } // FUNCTION: LEGO1 0x100256c0 @@ -506,7 +506,7 @@ void LegoCarBuild::Enable(MxBool p_enable) } // STUB: LEGO1 0x10025720 -undefined4 LegoCarBuild::FUN_10025720(undefined4 param_1) +undefined4 LegoCarBuild::FUN_10025720(undefined4 p_param1) { // TODO return 0; @@ -529,11 +529,11 @@ MxS32 LegoCarBuild::FUN_10025d70() // FUNCTION: LEGO1 0x10025db0 // FUNCTION: BETA10 0x1006ed18 -void LegoCarBuild::FUN_10025db0(const char* param_1, undefined4 param_2) +void LegoCarBuild::FUN_10025db0(const char* p_param1, undefined4 p_param2) { - m_unk0x33c = (MxControlPresenter*) Find("MxControlPresenter", param_1); + m_unk0x33c = (MxControlPresenter*) Find("MxControlPresenter", p_param1); - MxS16 sVar3 = 1 - ((param_2 / 5) & 1); + MxS16 sVar3 = 1 - ((p_param2 / 5) & 1); if (m_yellowCtl == m_unk0x33c) { if (sVar3 != g_unk0x100f11cc) { @@ -566,10 +566,10 @@ MxBool LegoCarBuild::Escape() } // FUNCTION: LEGO1 0x10025ee0 -MxS32 LegoCarBuild::FUN_10025ee0(undefined4 param_1) +MxS32 LegoCarBuild::FUN_10025ee0(undefined4 p_param1) { // TODO: Work out constants - switch (param_1) { + switch (p_param1) { case 1: return 0x2f; case 2: diff --git a/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp b/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp index 1edb3457..d143e670 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuildpresenter.cpp @@ -46,14 +46,14 @@ void LegoCarBuildAnimPresenter::EndAction() // STUB: LEGO1 0x10079920 // STUB: BETA10 0x1007225d -void LegoCarBuildAnimPresenter::FUN_10079920(float param_1) +void LegoCarBuildAnimPresenter::FUN_10079920(float p_param1) { // TODO } // STUB: LEGO1 0x10079ca0 // STUB: BETA10 0x10072740 -MxBool LegoCarBuildAnimPresenter::FUN_10079ca0(const char* param_1) +MxBool LegoCarBuildAnimPresenter::FUN_10079ca0(const char* p_param1) { // TODO; pretty short return FALSE; diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index d597998b..62b774a6 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -63,26 +63,26 @@ LegoEntity* PickEntity(MxLong, MxLong) // STUB: LEGO1 0x1003dde0 // STUB: BETA10 0x100d358e -void FUN_1003dde0(LegoROI* param_1, float param_2) +void FUN_1003dde0(LegoROI* p_param1, MxFloat p_param2) { // TODO } // FUNCTION: LEGO1 0x1003ded0 // FUNCTION: BETA10 0x100d3802 -MxBool FUN_1003ded0(float param_1[3], float param_2[3], float param_3[3]) +MxBool FUN_1003ded0(MxFloat p_param1[3], MxFloat p_param2[3], MxFloat p_param3[3]) { - float local_1c[4]; - float local_10[3]; + MxFloat local_1c[4]; + MxFloat local_10[3]; Tgl::View* view = VideoManager()->Get3DManager()->GetLego3DView()->GetView(); - local_1c[0] = param_1[0]; - local_1c[1] = param_1[1]; + local_1c[0] = p_param1[0]; + local_1c[1] = p_param1[1]; local_1c[2] = 1.0f; local_1c[3] = 1.0f; - view->TransformScreenToWorld(local_1c, param_3); + view->TransformScreenToWorld(local_1c, p_param3); local_1c[0] *= 2.0; local_1c[1] *= 2.0; @@ -90,15 +90,15 @@ MxBool FUN_1003ded0(float param_1[3], float param_2[3], float param_3[3]) view->TransformScreenToWorld(local_1c, local_10); - param_2[0] = local_10[0] - param_3[0]; - param_2[1] = local_10[1] - param_3[1]; - param_2[2] = local_10[2] - param_3[2]; + p_param2[0] = local_10[0] - p_param3[0]; + p_param2[1] = local_10[1] - p_param3[1]; + p_param2[2] = local_10[2] - p_param3[2]; return TRUE; } // FUNCTION: LEGO1 0x1003df70 // FUNCTION: BETA10 0x100d38cb -MxBool TransformWorldToScreen(const float world[3], float screen[4]) +MxBool TransformWorldToScreen(const MxFloat world[3], MxFloat screen[4]) { VideoManager()->Get3DManager()->GetLego3DView()->GetView()->TransformWorldToScreen(world, screen); return TRUE;