rndtrash/re3-symbian
1
0
Fork 0
mirror of https://gitlab.com/shinovon/re3-symbian.git synced 2026-05-23 01:57:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to fix compilation

Browse source
This commit is contained in:
Shinovon 2026-05-08 05:59:16 +05:00
parent e392f442b6
commit 85d6e68889
5 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
group/common.mmh
View file

@ -32,5 +32,5 @@ MACRO RW_OPENGL
SYSTEMINCLUDE /epoc32/include/stdapis/stlport SYSTEMINCLUDE /epoc32/include/stdapis/stlport
SYSTEMINCLUDE /epoc32/include/stdapis/stlport/stl SYSTEMINCLUDE /epoc32/include/stdapis/stlport/stl
MACRO RW_GLES1 MACRO RW_GLES1
MACRO S60V5 MACRO S60V3
#endif #endif

3
src/core/ZoneCull.cpp
View file

@ -16,7 +16,8 @@
#include "Renderer.h" #include "Renderer.h"
#if defined __ARMCC_VERSION && !defined _DEBUG #if defined __ARMCC_VERSION && !defined _DEBUG
#pragma O2 // fixes crash // fixes crash
#pragma O2
#endif #endif
int32 CCullZones::NumCullZones; int32 CCullZones::NumCullZones;

10
src/math/math.cpp
View file

@ -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"); ": : "r" (out) , "r" (n), "r" (&mat), "r" (in), "r" (stride): "memory");
#else #else
while(n--){ while(n--){
#ifdef S60V3
const RwV3d i = *in;
*out = mat * i;
#else
*out = mat * *in; *out = mat * *in;
#endif
in = (RwV3d*)((uint8*)in + stride); in = (RwV3d*)((uint8*)in + stride);
out++; 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"); ": : "r" (out) , "r" (n), "r" (&mat) ,"r" (in): "memory");
#else #else
while(n--){ while(n--){
#ifdef S60V3
const RwV3d i = *in;
*out = mat * i;
#else
*out = mat * *in; *out = mat * *in;
#endif
in++; in++;
out++; out++;
} }

3
src/peds/PlayerPed.cpp
View file

@ -1,5 +1,6 @@
#if defined __ARMCC_VERSION && !defined _DEBUG #if defined __ARMCC_VERSION && !defined _DEBUG
#pragma O2 // fixes crash // fixes crash
#pragma O2
#endif #endif
#include "common.h" #include "common.h"

7
src/skel/symbian/symbian.cpp
View file

@ -445,10 +445,9 @@ public:
TRACE("gGameState = GS_PLAYING_GAME;"); TRACE("gGameState = GS_PLAYING_GAME;");
break; break;
case GS_PLAYING_GAME: case GS_PLAYING_GAME:
if (!ForegroundApp) break; // float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond(); if (RwInitialised && ForegroundApp) {
if ( RwInitialised ) { // if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
RsEventHandler(rsIDLE, (void *)TRUE); RsEventHandler(rsIDLE, (void *)TRUE);
} }
break; break;