isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-19 05:41:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings (#83)

Browse Source
This commit is contained in:
Anders Jenbo 2025-05-14 16:29:26 +02:00 committed by GitHub
parent 7c6cec2f54
commit c9030c94fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legoracespecial.h
View File

@ -35,7 +35,7 @@ class LegoCarRaceActor : public virtual LegoRaceActor {
return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name); return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name);
} }
inline MxU32 VTable0x6c( MxU32 VTable0x6c(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
Vector3& p_v1, Vector3& p_v1,
Vector3& p_v2, Vector3& p_v2,
@ -127,7 +127,7 @@ class LegoJetskiRaceActor : public virtual LegoCarRaceActor {
return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name); return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
} }
inline MxU32 VTable0x6c( MxU32 VTable0x6c(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
Vector3& p_v1, Vector3& p_v1,
Vector3& p_v2, Vector3& p_v2,

4
LEGO1/lego/legoomni/src/race/legoracespecial.cpp
View File

@ -416,7 +416,7 @@ void LegoJetskiRaceActor::Animate(float p_time)
// FUNCTION: LEGO1 0x10081840 // FUNCTION: LEGO1 0x10081840
// FUNCTION: BETA10 0x100cf680 // FUNCTION: BETA10 0x100cf680
inline MxU32 LegoCarRaceActor::VTable0x6c( MxU32 LegoCarRaceActor::VTable0x6c(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
Vector3& p_v1, Vector3& p_v1,
Vector3& p_v2, Vector3& p_v2,
@ -515,7 +515,7 @@ inline MxU32 LegoCarRaceActor::VTable0x6c(
} }
// FUNCTION: LEGO1 0x10081fd0 // FUNCTION: LEGO1 0x10081fd0
inline MxU32 LegoJetskiRaceActor::VTable0x6c( MxU32 LegoJetskiRaceActor::VTable0x6c(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
Vector3& p_v1, Vector3& p_v1,
Vector3& p_v2, Vector3& p_v2,

2
LEGO1/lego/legoomni/src/worlds/historybook.cpp
View File

@ -142,7 +142,7 @@ void HistoryBook::ReadyWorld()
memset(m_scores[i]->GetBitmapStart(scoreboxX, scoreboxY + lax), scoreColors[color - 1], 4); memset(m_scores[i]->GetBitmapStart(scoreboxX, scoreboxY + lax), scoreColors[color - 1], 4);
#else #else
if (m_scores[i]->GetAlphaMask() != NULL) { if (m_scores[i]->GetAlphaMask() != NULL) {
memset(NULL, scoreColors[color - 1], 4); // memset(NULL, scoreColors[color - 1], 4);
} }
else { else {
memset( memset(

4
LEGO1/omni/src/stream/mxio.cpp
View File

@ -489,7 +489,11 @@ MxU16 MXIOINFO::Descend(ISLE_MMCKINFO* p_chunkInfo, const ISLE_MMCKINFO* p_paren
} }
} }
else { else {
#if defined(_MSC_VER)
ofs = LONG_MAX; ofs = LONG_MAX;
#else
ofs = INT_MAX;
#endif
if (p_parentInfo) { if (p_parentInfo) {
ofs = p_parentInfo->cksize + p_parentInfo->dwDataOffset; ofs = p_parentInfo->cksize + p_parentInfo->dwDataOffset;