zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-15 12:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- block game input during intro cutscenes

Browse source 
Fixes #158
This commit is contained in:
Christoph Oelckers 2020-08-11 00:42:08 +02:00
parent 7243c08379
commit 000c00dc91
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/common/engine/d_event.cpp
View file

@ -42,6 +42,7 @@
#include "m_joy.h" #include "m_joy.h"
#include "vm.h" #include "vm.h"
#include "cheathandler.h" #include "cheathandler.h"
#include "gamestate.h"
bool G_Responder(event_t* ev); bool G_Responder(event_t* ev);
@ -70,6 +71,8 @@ void D_ProcessEvents (void)
continue; continue;
if (ev->type == EV_DeviceChange) if (ev->type == EV_DeviceChange)
UpdateJoystickMenu(I_UpdateDeviceList()); UpdateJoystickMenu(I_UpdateDeviceList());
if (gamestate == GS_INTRO)
continue;
if (C_Responder (ev)) if (C_Responder (ev))
continue; // console ate the event continue; // console ate the event
if (M_Responder (ev)) if (M_Responder (ev))

2
source/games/duke/src/gameloop.cpp
View file

@ -387,10 +387,10 @@ bool GameTicker()
void startmainmenu() void startmainmenu()
{ {
gamestate = GS_DEMOSCREEN;
M_StartControlPanel(false); M_StartControlPanel(false);
M_SetMenu(NAME_Mainmenu); M_SetMenu(NAME_Mainmenu);
FX_StopAllSounds(); FX_StopAllSounds();
gamestate = GS_DEMOSCREEN;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------