diff --git a/LEGO1/lego/legoomni/include/legoracespecial.h b/LEGO1/lego/legoomni/include/legoracespecial.h index 3382a394..b187e5d8 100644 --- a/LEGO1/lego/legoomni/include/legoracespecial.h +++ b/LEGO1/lego/legoomni/include/legoracespecial.h @@ -35,7 +35,7 @@ class LegoCarRaceActor : public virtual LegoRaceActor { return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name); } - inline MxU32 VTable0x6c( + MxU32 VTable0x6c( LegoPathBoundary* p_boundary, Vector3& p_v1, Vector3& p_v2, @@ -127,7 +127,7 @@ class LegoJetskiRaceActor : public virtual LegoCarRaceActor { return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name); } - inline MxU32 VTable0x6c( + MxU32 VTable0x6c( LegoPathBoundary* p_boundary, Vector3& p_v1, Vector3& p_v2, diff --git a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp index f9fe2eb7..801ad8e7 100644 --- a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp @@ -416,7 +416,7 @@ void LegoJetskiRaceActor::Animate(float p_time) // FUNCTION: LEGO1 0x10081840 // FUNCTION: BETA10 0x100cf680 -inline MxU32 LegoCarRaceActor::VTable0x6c( +MxU32 LegoCarRaceActor::VTable0x6c( LegoPathBoundary* p_boundary, Vector3& p_v1, Vector3& p_v2, @@ -515,7 +515,7 @@ inline MxU32 LegoCarRaceActor::VTable0x6c( } // FUNCTION: LEGO1 0x10081fd0 -inline MxU32 LegoJetskiRaceActor::VTable0x6c( +MxU32 LegoJetskiRaceActor::VTable0x6c( LegoPathBoundary* p_boundary, Vector3& p_v1, Vector3& p_v2, diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp index f31f1258..5aa1e49e 100644 --- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp @@ -142,7 +142,7 @@ void HistoryBook::ReadyWorld() memset(m_scores[i]->GetBitmapStart(scoreboxX, scoreboxY + lax), scoreColors[color - 1], 4); #else if (m_scores[i]->GetAlphaMask() != NULL) { - memset(NULL, scoreColors[color - 1], 4); + // memset(NULL, scoreColors[color - 1], 4); } else { memset( diff --git a/LEGO1/omni/src/stream/mxio.cpp b/LEGO1/omni/src/stream/mxio.cpp index 6efbe5ef..52c15186 100644 --- a/LEGO1/omni/src/stream/mxio.cpp +++ b/LEGO1/omni/src/stream/mxio.cpp @@ -489,7 +489,11 @@ MxU16 MXIOINFO::Descend(ISLE_MMCKINFO* p_chunkInfo, const ISLE_MMCKINFO* p_paren } } else { +#if defined(_MSC_VER) ofs = LONG_MAX; +#else + ofs = INT_MAX; +#endif if (p_parentInfo) { ofs = p_parentInfo->cksize + p_parentInfo->dwDataOffset;