teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed RR was still generating input events when the game was paused.

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-01 13:07:58 +01:00
parent 77ad7dfb81
commit 1cce5d8de2
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/rr/src/game.cpp
View file

@ -1041,7 +1041,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
if (RRRA && pPlayer->drug_mode > 0) if (RRRA && pPlayer->drug_mode > 0)
{ {
while (pPlayer->drug_timer < totalclock && !(pPlayer->gm & MODE_MENU) && !ud.pause_on) while (pPlayer->drug_timer < totalclock && !(pPlayer->gm & MODE_MENU) && !ud.pause_on && !GUICapture)
{ {
int aspect; int aspect;
if (pPlayer->drug_stat[0] == 0) if (pPlayer->drug_stat[0] == 0)
@ -6001,7 +6001,7 @@ void G_HandleLocalKeys(void)
} }
} }
if (g_player[myconnectindex].ps->cheat_phase == 1 || (g_player[myconnectindex].ps->gm&(MODE_MENU|MODE_TYPE))) if (g_player[myconnectindex].ps->cheat_phase == 1 || (g_player[myconnectindex].ps->gm&(MODE_MENU|MODE_TYPE)) || GUICapture)
return; return;
if (buttonMap.ButtonDown(gamefunc_See_Coop_View) && (GTFLAGS(GAMETYPE_COOPVIEW) || ud.recstat == 2)) if (buttonMap.ButtonDown(gamefunc_See_Coop_View) && (GTFLAGS(GAMETYPE_COOPVIEW) || ud.recstat == 2))
@ -7406,7 +7406,7 @@ MAIN_LOOP_RESTART:
do do
{ {
if (ready2send == 0) break; if (ready2send == 0) break;
Net_GetInput(); Net_GetInput();
ototalclock += TICSPERFRAME; ototalclock += TICSPERFRAME;

2
source/rr/src/net.cpp
View file

@ -1775,7 +1775,7 @@ void Net_GetInput(void)
if (numplayers > 1) if (numplayers > 1)
Net_GetPackets(); Net_GetPackets();
if (g_player[myconnectindex].movefifoend - movefifoplc >= 100) if (g_player[myconnectindex].movefifoend - movefifoplc >= 100 || GUICapture)
return; return;
if (RRRA && g_player[myconnectindex].ps->on_motorcycle) if (RRRA && g_player[myconnectindex].ps->on_motorcycle)

2
source/sw/src/game.cpp
View file

@ -2635,7 +2635,7 @@ void RunLevel(void)
faketimerhandler(); faketimerhandler();
if (LoadGameOutsideMoveLoop) if (LoadGameOutsideMoveLoop)
{ {
return; return; // Stop the game loop if a savegame was loaded from the menu.
} }
if (M_Active()) if (M_Active())