From 074d3a28eb191285ca19cf8918b09deb894db4f4 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 4 Dec 2024 14:14:05 -0700 Subject: [PATCH] Name brick vars --- LEGO1/lego/legoomni/include/legoact2.h | 8 ++++---- LEGO1/lego/legoomni/src/worlds/legoact2.cpp | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h index 8e53e503..797b2249 100644 --- a/LEGO1/lego/legoomni/include/legoact2.h +++ b/LEGO1/lego/legoomni/include/legoact2.h @@ -117,10 +117,10 @@ class LegoAct2 : public LegoWorld { Act2mainScript::Script m_unk0x1140; // 0x1140 Act2mainScript::Script m_unk0x1144; // 0x1144 undefined4 m_unk0x1148; // 0x1148 - undefined m_unk0x114c; // 0x114c - undefined m_unk0x114d; // 0x114d - undefined m_unk0x114e; // 0x114e - undefined m_unk0x114f; // 0x114e + undefined m_firstBrick; // 0x114c + undefined m_secondBrick; // 0x114d + undefined m_thirdBrick; // 0x114e + undefined m_fourthBrick; // 0x114e LegoGameState::Area m_destLocation; // 0x1150 }; diff --git a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp index df71bf17..7109b663 100644 --- a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp +++ b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp @@ -782,12 +782,12 @@ void LegoAct2::SpawnBricks() LegoEntity* entity; if ((MxS16) (rand() % 2) == 1) { - m_unk0x114c = 0; + m_firstBrick = 0; location = infobridge; MxTrace("infobridge\n"); } else { - m_unk0x114c = 1; + m_firstBrick = 1; location = palmTreeInPark; MxTrace("palm tree in park\n"); } @@ -806,12 +806,12 @@ void LegoAct2::SpawnBricks() local2world = roi->GetLocal2World(); if ((MxS16) (rand() % 2) == 1) { - m_unk0x114d = 2; + m_secondBrick = 2; location = store; MxTrace("store\n"); } else { - m_unk0x114d = 3; + m_secondBrick = 3; location = postOffice; MxTrace("p.o.\n"); } @@ -830,12 +830,12 @@ void LegoAct2::SpawnBricks() local2world = roi->GetLocal2World(); if ((MxS16) (rand() % 2) == 1) { - m_unk0x114e = 4; + m_thirdBrick = 4; location = h3; MxTrace("h3\n"); } else { - m_unk0x114e = 5; + m_thirdBrick = 5; location = ht; MxTrace("ht\n"); } @@ -855,24 +855,24 @@ void LegoAct2::SpawnBricks() if ((MxS16) (rand() % 2) == 1) { if ((MxS16) (rand() % 2) == 1) { - m_unk0x114f = 6; + m_fourthBrick = 6; location = posta; MxTrace("po.sta.\n"); } else { - m_unk0x114f = 7; + m_fourthBrick = 7; location = ptree; MxTrace("p.tree\n"); } } else { if ((MxS16) (rand() % 2) == 1) { - m_unk0x114f = 8; + m_fourthBrick = 8; location = jail; MxTrace("jail\n"); } else { - m_unk0x114f = 9; + m_fourthBrick = 9; location = hospital; MxTrace("hospi\n"); }