Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-21 18:02:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #171 from OpenDriver2/develop-SoapyMan

Browse Source 
RC2 fixes
This commit is contained in:
Ilya 2022-02-07 21:14:15 +03:00 committed by GitHub
commit 3063442dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src_rebuild/Game/C/cop_ai.c
View File

@ -1189,8 +1189,7 @@ void ControlCops(void)
copsWereInPursuit = 0; copsWereInPursuit = 0;
if (CopsCanSeePlayer && OutOfSightCount < 256 || // [A] was player_position_known. Resolves speech in some missions if (player_position_known > 0)
player_position_known > 1 && GameType == GAME_GETAWAY)
{ {
if (*playerFelony > FELONY_PURSUIT_MIN_VALUE) if (*playerFelony > FELONY_PURSUIT_MIN_VALUE)
copsWereInPursuit = 1; copsWereInPursuit = 1;

26
src_rebuild/Game/C/main.c
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);