diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h index 96f753b8..fa59368f 100644 --- a/LEGO1/lego/legoomni/include/legopathactor.h +++ b/LEGO1/lego/legoomni/include/legopathactor.h @@ -13,6 +13,8 @@ struct LegoPathEdgeContainer; struct LegoUnknown100db7f4; class LegoWEEdge; +extern MxLong g_unk0x100f3308; + // VTABLE: LEGO1 0x100d6e28 // SIZE 0x154 class LegoPathActor : public LegoActor { diff --git a/LEGO1/lego/legoomni/include/legoracers.h b/LEGO1/lego/legoomni/include/legoracers.h index 1a75cd91..689254be 100644 --- a/LEGO1/lego/legoomni/include/legoracers.h +++ b/LEGO1/lego/legoomni/include/legoracers.h @@ -102,7 +102,6 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap { static MxLong g_timeLastSoundPlayed; static MxS32 g_unk0x100f0b88; static MxBool g_unk0x100f0b8c; - static MxLong g_unk0x100f3308; static Mx3DPointFloat g_vector020; }; diff --git a/LEGO1/lego/legoomni/src/race/legoracers.cpp b/LEGO1/lego/legoomni/src/race/legoracers.cpp index 71f1831f..83ff90f8 100644 --- a/LEGO1/lego/legoomni/src/race/legoracers.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracers.cpp @@ -125,11 +125,6 @@ MxS32 LegoRaceCar::g_unk0x100f0b88 = 0; // GLOBAL: BETA10 0x101f5f98 MxBool LegoRaceCar::g_unk0x100f0b8c = TRUE; -// Not sure why the next two are so far away from the rest in address space - -// GLOBAL: LEGO1 0x100f3308 -MxLong LegoRaceCar::g_unk0x100f3308 = 0; - // Initialized at LEGO1 0x10012db0 // GLOBAL: LEGO1 0x10102af0 Mx3DPointFloat LegoRaceCar::g_vector020 = Mx3DPointFloat(0.0f, 2.0f, 0.0f); diff --git a/LEGO1/omni/include/mxtimer.h b/LEGO1/omni/include/mxtimer.h index ced00435..a0975177 100644 --- a/LEGO1/omni/include/mxtimer.h +++ b/LEGO1/omni/include/mxtimer.h @@ -20,7 +20,7 @@ class MxTimer : public MxCore { return g_lastTimeTimerStarted; } else { - return g_lastTimeCalculated - this->m_startTime; + return GetTimeElapsed(); } } @@ -29,7 +29,7 @@ class MxTimer : public MxCore { static MxLong GetLastTimeCalculated() { return g_lastTimeCalculated; } static MxLong GetLastTimeTimerStarted() { return g_lastTimeTimerStarted; } - // FUNCTION: BETA10 0x1000f320 + // FUNCTION: BETA10 0x10017810 MxLong GetTimeElapsed() { return g_lastTimeCalculated - m_startTime; } // SYNTHETIC: LEGO1 0x100ae0d0