diff options
| author | Simon Howard | 2011-10-17 21:45:50 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-10-17 21:45:50 +0000 |
| commit | a84d0161a033548436278a57b7d2c3b09b35b003 (patch) | |
| tree | 1f4c02be2486397e70970b997fdf294f8cecbfc8 /src/hexen | |
| parent | 1af09ba2f33e9300420a5ebad01ed15cbfef7835 (diff) | |
| download | chocolate-doom-a84d0161a033548436278a57b7d2c3b09b35b003.tar.gz chocolate-doom-a84d0161a033548436278a57b7d2c3b09b35b003.tar.bz2 chocolate-doom-a84d0161a033548436278a57b7d2c3b09b35b003.zip | |
Rearrange Hexen startup to fix crash when starting a deathmatch game.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2439
Diffstat (limited to 'src/hexen')
| -rw-r--r-- | src/hexen/h2_main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c index 3ed8b580..13e27a22 100644 --- a/src/hexen/h2_main.c +++ b/src/hexen/h2_main.c @@ -346,8 +346,8 @@ void D_DoomMain(void) R_Init(); ST_Message("\n"); - if (M_CheckParm("-net")) - ST_NetProgress(); // Console player found + //if (M_CheckParm("-net")) + // ST_NetProgress(); // Console player found ST_Message("P_Init: Init Playloop state.\n"); P_Init(); @@ -356,15 +356,17 @@ void D_DoomMain(void) // MAPINFO.TXT script must be already processed. WarpCheck(); - ST_Message("SB_Init: Loading patches.\n"); - SB_Init(); - ST_Done(); // Netgame start must be here, after the splash screen has finished. ST_Message("D_CheckNetGame: Checking network game status.\n"); D_CheckNetGame(); + // SB_Init has been moved here; the status bar must be initialized + // *after* the netgame has started. + ST_Message("SB_Init: Loading patches.\n"); + SB_Init(); + if (autostart) { ST_Message("Warp to Map %d (\"%s\":%d), Skill %d\n", |