cleanup: clean boot sequence

[d2df-sdl.git] / src / game / g_game.pas

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 9095b1d4ab6de440e131a4fbfd1aaf2ffb2c90b5..af3d8ad0c99ffcdd01002045a44084cde72561c2 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -375,6 +375,7 @@ var
   g_rlayer_water: Boolean = true;
   g_rlayer_fore: Boolean = true;
 
+  wNeedTimeReset: Boolean = false;
 
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
@@ -1466,13 +1467,7 @@ begin
     g_Game_SetLoadingText(Format('Doom 2D: Forever %s', [GAME_VERSION]), 0, False);
     g_Game_SetLoadingText('', 0, False);
 
-    g_Game_SetLoadingText(_lc[I_LOAD_CONSOLE], 0, False);
-    r_Console_Init;
-    g_Console_Init();
-
     g_Game_SetLoadingText(_lc[I_LOAD_MODELS], 0, False);
-    r_PlayerModel_Initialize;
-
     // load models from all possible wad types, in all known directories
     // this does a loosy job (linear search, ooph!), but meh
     for wext in wadExtensions do
@@ -1526,11 +1521,6 @@ begin
     g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True, True);
     g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
 
-{$IFNDEF HEADLESS}
-    g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);
-    g_Menu_Init();
-{$ENDIF}
-
     gMusic := TMusic.Create();
     gMusic.SetByName('MUSIC_MENU');
     gMusic.Play();
@@ -2628,7 +2618,6 @@ begin
   g_Game_StopAllSounds(True);
   gMusic.Free();
   g_Game_FreeData();
-  r_PlayerModel_Finalize;
   g_PlayerModel_FreeData();
   g_Texture_DeleteAll();
   g_Frames_DeleteAll();
@@ -3542,7 +3531,7 @@ begin
       gGameOn := True;
 
       DisableCheats();
-      ResetTimer();
+      wNeedTimeReset := True;
 
       if gGameSettings.GameMode = GM_CTF then
       begin