From 85d6e68889f5b7e8df21546a81e127af26c2ef6f Mon Sep 17 00:00:00 2001 From: Shinovon Date: Fri, 8 May 2026 05:59:16 +0500 Subject: [PATCH] Try to fix compilation --- group/common.mmh | 2 +- src/core/ZoneCull.cpp | 3 ++- src/math/math.cpp | 10 ++++++++++ src/peds/PlayerPed.cpp | 3 ++- src/skel/symbian/symbian.cpp | 7 +++---- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/group/common.mmh b/group/common.mmh index 4f5ec61..a72793f 100644 --- a/group/common.mmh +++ b/group/common.mmh @@ -32,5 +32,5 @@ MACRO RW_OPENGL SYSTEMINCLUDE /epoc32/include/stdapis/stlport SYSTEMINCLUDE /epoc32/include/stdapis/stlport/stl MACRO RW_GLES1 -MACRO S60V5 +MACRO S60V3 #endif diff --git a/src/core/ZoneCull.cpp b/src/core/ZoneCull.cpp index 03b399d..56192ea 100644 --- a/src/core/ZoneCull.cpp +++ b/src/core/ZoneCull.cpp @@ -16,7 +16,8 @@ #include "Renderer.h" #if defined __ARMCC_VERSION && !defined _DEBUG -#pragma O2 // fixes crash +// fixes crash +#pragma O2 #endif int32 CCullZones::NumCullZones; diff --git a/src/math/math.cpp b/src/math/math.cpp index 8cb56da..ff86039 100644 --- a/src/math/math.cpp +++ b/src/math/math.cpp @@ -80,7 +80,12 @@ void TransformPoints(CVuVector *out, int n, const CMatrix &mat, const RwV3d *in, ": : "r" (out) , "r" (n), "r" (&mat), "r" (in), "r" (stride): "memory"); #else while(n--){ +#ifdef S60V3 + const RwV3d i = *in; + *out = mat * i; +#else *out = mat * *in; +#endif in = (RwV3d*)((uint8*)in + stride); out++; } @@ -110,7 +115,12 @@ void TransformPoints(CVuVector *out, int n, const CMatrix &mat, const CVuVector ": : "r" (out) , "r" (n), "r" (&mat) ,"r" (in): "memory"); #else while(n--){ +#ifdef S60V3 + const RwV3d i = *in; + *out = mat * i; +#else *out = mat * *in; +#endif in++; out++; } diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 4876f79..e44a208 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -1,5 +1,6 @@ #if defined __ARMCC_VERSION && !defined _DEBUG -#pragma O2 // fixes crash +// fixes crash +#pragma O2 #endif #include "common.h" diff --git a/src/skel/symbian/symbian.cpp b/src/skel/symbian/symbian.cpp index e0ad7bc..0d8a0f5 100644 --- a/src/skel/symbian/symbian.cpp +++ b/src/skel/symbian/symbian.cpp @@ -445,10 +445,9 @@ public: TRACE("gGameState = GS_PLAYING_GAME;"); break; case GS_PLAYING_GAME: - if (!ForegroundApp) break; - float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond(); - if ( RwInitialised ) { - if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms) +// float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond(); + if (RwInitialised && ForegroundApp) { +// if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms) RsEventHandler(rsIDLE, (void *)TRUE); } break;