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

- move pause pad checks to avoid bug

Browse Source
This commit is contained in:
Ilya Shurumov 2021-05-17 22:33:19 +06:00 committed by InspirationByte
parent bc131397bb
commit e575541624
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/DRIVER2/REPLAYS/ReChases/CUT70_N.R
View File

Binary file not shown.

BIN
data/DRIVER2/REPLAYS/ReChases/CUT78_N.R
View File

Binary file not shown.

BIN
data/DRIVER2/REPLAYS/ReChases/CUT86_N.R
View File

Binary file not shown.

BIN
data/DRIVER2/REPLAYS/ReChases/CUT94_N.R
View File

Binary file not shown.

46
src_rebuild/Game/C/main.c
View File

@ -1416,29 +1416,6 @@ void StepGame(void)
PrintStringFeature(G_LTXT(GTXT_Fastforward), 100, 0x1e, 0x1000, 0x1000, 0); PrintStringFeature(G_LTXT(GTXT_Fastforward), 100, 0x1e, 0x1000, 0x1000, 0);
} }
// check for pause mode
if (AttractMode == 0 && pauseflag == 0)
{
if (FrameCnt > 2)
{
if (NumPlayers == 1)
{
if (paddp == 0x800 && bMissionTitleFade == 0) // [A] && gInGameCutsceneActive == 0) // allow pausing during cutscene
{
EnablePause(PAUSEMODE_PAUSE);
}
}
else if (paddp == 0x800)
{
EnablePause(PAUSEMODE_PAUSEP1);
}
else if (NumPlayers == 2 && (Pads[1].dirnew & 0x800) != 0)
{
EnablePause(PAUSEMODE_PAUSEP2);
}
}
}
if (NoPlayerControl == 0) if (NoPlayerControl == 0)
{ {
if (pad_connected < 1 && FrameCnt > 2 && bMissionTitleFade == 0 && gInGameCutsceneActive == 0) if (pad_connected < 1 && FrameCnt > 2 && bMissionTitleFade == 0 && gInGameCutsceneActive == 0)
@ -1531,6 +1508,29 @@ void CheckForPause(void)
gDieWithFade = 32; gDieWithFade = 32;
} }
// check pads for pause here
if (AttractMode == 0 && pauseflag == 0)
{
if (FrameCnt > 2)
{
if (NumPlayers == 1)
{
if (paddp == 0x800 && bMissionTitleFade == 0) // [A] && gInGameCutsceneActive == 0) // allow pausing during cutscene
{
EnablePause(PAUSEMODE_PAUSE);
}
}
else if (paddp == 0x800)
{
EnablePause(PAUSEMODE_PAUSEP1);
}
else if (NumPlayers == 2 && (Pads[1].dirnew & 0x800))
{
EnablePause(PAUSEMODE_PAUSEP2);
}
}
}
if (WantPause) if (WantPause)
{ {
WantPause = 0; WantPause = 0;