stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 21:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'titlecard-event-fix' into 'master'

Browse source 
Remove D_ProcessEvents call in G_PreLevelTitleCard (resolves #317)

Closes #317

See merge request STJr/SRB2Internal!506
This commit is contained in:
MascaraSnake 2019-11-22 09:12:02 -05:00
commit ae8f0b42aa
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -4602,7 +4602,7 @@ static void Local_Maketic(INT32 realtics)
{ {
I_OsPolling(); // I_Getevent I_OsPolling(); // I_Getevent
D_ProcessEvents(); // menu responder, cons responder, D_ProcessEvents(); // menu responder, cons responder,
// game responder calls HU_Responder, AM_Responder, F_Responder, // game responder calls HU_Responder, AM_Responder,
// and G_MapEventsToControls // and G_MapEventsToControls
if (!dedicated) rendergametic = gametic; if (!dedicated) rendergametic = gametic;
// translate inputs (keyboard/mouse/joystick) into game controls // translate inputs (keyboard/mouse/joystick) into game controls

3
src/d_main.c
View file

@ -180,9 +180,6 @@ void D_ProcessEvents(void)
if (M_ScreenshotResponder(ev)) if (M_ScreenshotResponder(ev))
continue; // ate the event continue; // ate the event
if (WipeStageTitle)
continue;
if (gameaction == ga_nothing && gamestate == GS_TITLESCREEN) if (gameaction == ga_nothing && gamestate == GS_TITLESCREEN)
{ {
if (cht_Responder(ev)) if (cht_Responder(ev))

3
src/g_game.c
View file

@ -1749,9 +1749,6 @@ void G_PreLevelTitleCard(tic_t ticker, boolean update)
I_Sleep(); I_Sleep();
lasttime = nowtime; lasttime = nowtime;
// Run some bullshit whatever
D_ProcessEvents();
ST_runTitleCard(); ST_runTitleCard();
ST_preLevelTitleCardDrawer(ticker, update); ST_preLevelTitleCardDrawer(ticker, update);