- simplify ifdefs in main

This commit is contained in:
InspirationByte 2022-02-07 20:51:48 +03:00
parent 786f7db38f
commit adeeb77cf2

View File

@ -1546,9 +1546,7 @@ void CheckForPause(void)
} }
} }
#ifdef PSX
int gMultiStep = 0; int gMultiStep = 0;
#endif
// [D] [T] // [D] [T]
void State_GameLoop(void* param) void State_GameLoop(void* param)
@ -1568,17 +1566,16 @@ void State_GameLoop(void* param)
UpdatePadData(); UpdatePadData();
CheckForPause(); CheckForPause();
// moved from StepGame
if (FrameCnt == 5)
SetDispMask(1);
#ifdef PSX #ifdef PSX
static int lastTime32Hz = 0; static int lastTime32Hz = 0;
int curTime = clock_realTime.time32Hz; int curTime = clock_realTime.time32Hz;
int numFrames = curTime - lastTime32Hz; int numFrames = curTime - lastTime32Hz;
// moved from StepGame
if (FrameCnt == 5)
SetDispMask(1);
// game makes 7 frames
if (FastForward) if (FastForward)
cnt = 7; cnt = 7;
else else
@ -1598,25 +1595,14 @@ void State_GameLoop(void* param)
StepGame(); StepGame();
} }
DrawGame();
#else #else
// moved from StepGame cnt = FastForward ? 7 : 1;
if (FrameCnt == 5)
SetDispMask(1);
// game makes 7 frames
if (FastForward)
cnt = 7;
else
cnt = 1;
while (--cnt >= 0) while (--cnt >= 0)
StepGame(); StepGame();
#endif
_CutRec_Draw(); _CutRec_Draw();
DrawGame(); DrawGame();
#endif
if (game_over) if (game_over)
SetState(STATE_GAMECOMPLETE); SetState(STATE_GAMECOMPLETE);