From 1f189dfa804a05177f99dda1044898eb63fdcb3f Mon Sep 17 00:00:00 2001 From: MegaMech Date: Thu, 23 Jan 2025 11:22:07 -0700 Subject: Game.cpp and World.cpp Cleanup (#159) * Remove CProperties and delete dup Properties from World.h * Improvement * Fix compile * Cleanup * Document gRaceState * wip cleanup * compile * Impl PlayerBombKart * Rename CourseManager_ to CM_ * Finish renames m_ to CM_ * cleanup * Remove extra printf --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> --- src/engine/objects/Lakitu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/engine/objects/Lakitu.cpp') diff --git a/src/engine/objects/Lakitu.cpp b/src/engine/objects/Lakitu.cpp index 1c8547bc8..93a87f5e1 100644 --- a/src/engine/objects/Lakitu.cpp +++ b/src/engine/objects/Lakitu.cpp @@ -160,12 +160,12 @@ void OLakitu::func_800791F0(s32 objectIndex, s32 playerId) { if ((gObjectList[objectIndex].unk_0D8 != 3) && (gObjectList[objectIndex].unk_0D8 != 7)) { func_800722CC(objectIndex, 1); - if (CourseManager_GetProps()->LakituTowType == LakituTowType::ICE) { + if (CM_GetProps()->LakituTowType == LakituTowType::ICE) { player->unk_0CA &= 0xFFEF; } } - if (CourseManager_GetProps()->LakituTowType == LakituTowType::ICE) { + if (CM_GetProps()->LakituTowType == LakituTowType::ICE) { func_800722CC(objectIndex, 0x00000010); player->unk_0CA &= 0xFFDF; } @@ -362,7 +362,7 @@ void OLakitu::func_800797AC(s32 playerId) { objectIndex = gIndexLakituList[playerId]; player = &gPlayerOne[playerId]; //if ((GetCourse() == GetSherbetLand()) && (player->unk_0CA & 1)) { - if ((CourseManager_GetProps()->LakituTowType == LakituTowType::ICE) && (player->unk_0CA & 1)) { + if ((CM_GetProps()->LakituTowType == LakituTowType::ICE) && (player->unk_0CA & 1)) { init_object(objectIndex, 7); player->unk_0CA |= 0x10; } else { -- cgit v1.2.3