diff options
Diffstat (limited to 'src/hexen')
| -rw-r--r-- | src/hexen/d_net.c | 4 | ||||
| -rw-r--r-- | src/hexen/st_start.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/hexen/d_net.c b/src/hexen/d_net.c index f3b7766e..5c64f7ed 100644 --- a/src/hexen/d_net.c +++ b/src/hexen/d_net.c @@ -33,6 +33,7 @@ #include "i_system.h" #include "i_timer.h" #include "i_video.h" +#include "i_videohr.h" #include "h2def.h" #include "p_local.h" #include "s_sound.h" @@ -239,7 +240,8 @@ static boolean StartupProgress(int now_ready, int total) ready = now_ready; - return true; + // Allow the user to hit escape during netgame startup to abort. + return !I_CheckAbortHR(); } // diff --git a/src/hexen/st_start.c b/src/hexen/st_start.c index 58df878e..b8cf389a 100644 --- a/src/hexen/st_start.c +++ b/src/hexen/st_start.c @@ -204,11 +204,11 @@ void ST_UpdateNetNotches(int notchPosition) void ST_Progress(void) { - // haleyjd FIXME: any way to get input here? SDL event loop? -#ifdef __WATCOMC__ // Check for ESC press -- during startup all events eaten here - I_StartupReadKeys(); -#endif + if (I_CheckAbortHR()) + { + I_Quit(); + } if (using_graphical_startup) { |