gl: implement d_sounds

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

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 380126ee18a6a1d6ea60a876883518ce6dd53106..a141feb44220f54d4505d4776f4acdac1f426886 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -1,4 +1,4 @@
- (* Copyright (C)  Doom 2D: Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -132,9 +132,6 @@ procedure g_Game_Announce_KillCombo(Param: Integer);
 procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
 procedure g_Game_StartVote(Command, Initiator: string);
 procedure g_Game_CheckVote;
-{$IFDEF ENABLE_RENDER}
-  procedure g_TakeScreenShot(Filename: string = '');
-{$ENDIF}
 procedure g_FatalError(Text: String);
 procedure g_SimpleError(Text: String);
 function  g_Game_IsTestMap(): Boolean;
@@ -315,8 +312,6 @@ var
   gRC_FullScreen, gRC_Maximized: Boolean;
   gLanguageChange: Boolean = False;
   gDebugMode: Boolean = False;
-  g_debug_Sounds: Boolean = False;
-  g_debug_Frames: Boolean = False;
   g_debug_WinMsgs: Boolean = False;
   g_debug_MonsterOff: Boolean = False;
   g_debug_BotAIOff: Byte = 0;
@@ -1034,8 +1029,6 @@ end;
 
 procedure ClearDebugCvars();
 begin
-  g_debug_Sounds := False;
-  g_debug_Frames := False;
   g_debug_WinMsgs := False;
   g_debug_MonsterOff := False;
   g_debug_BotAIOff := 0;
@@ -1484,7 +1477,7 @@ begin
   {$IFDEF ENABLE_GIBS}
     g_Gibs_RemoveAll;
   {$ENDIF}
-  {$IFDEF ENALBE_SHELLS}
+  {$IFDEF ENABLE_SHELLS}
     g_Shells_RemoveAll;
   {$ENDIF}
   {$IFDEF ENABLE_CORPSES}
@@ -3439,7 +3432,7 @@ begin
   {$IFDEF ENABLE_GIBS}
     g_Gibs_RemoveAll;
   {$ENDIF}
-  {$IFDEF ENALBE_SHELLS}
+  {$IFDEF ENABLE_SHELLS}
     g_Shells_RemoveAll;
   {$ENDIF}
   {$IFDEF ENABLE_CORPSES}
@@ -3513,12 +3506,13 @@ begin
   begin
     //result := g_Map_Load(gGameSettings.WAD + ':\' + ResName);
     result := g_Map_Load(NewWAD+':\'+ResName);
-    {$IFDEF ENABLE_RENDER}
-      r_Render_LoadTextures;
-    {$ENDIF}
   end;
   if Result then
     begin
+      {$IFDEF ENABLE_RENDER}
+        r_Render_LoadTextures;
+        r_Render_Reset;
+      {$ENDIF}
       g_Player_ResetAll(Force or gLastMap, gGameSettings.GameType = GT_SINGLE);
 
       gState := STATE_NONE;
@@ -3777,7 +3771,7 @@ begin
   {$IFDEF ENABLE_GIBS}
     g_Gibs_RemoveAll;
   {$ENDIF}
-  {$IFDEF ENALBE_SHELLS}
+  {$IFDEF ENABLE_SHELLS}
     g_Shells_RemoveAll;
   {$ENDIF}
   {$IFDEF ENABLE_CORPSES}
@@ -4670,22 +4664,6 @@ begin
       g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
       g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
     end
-    else if cmd = 'd_sounds' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        g_Debug_Sounds := (P[1][1] = '1');
-
-      g_Console_Add(Format('d_sounds is %d', [Byte(g_Debug_Sounds)]));
-    end
-    else if cmd = 'd_frames' then
-    begin
-      if (Length(P) > 1) and
-         ((P[1] = '1') or (P[1] = '0')) then
-        g_Debug_Frames := (P[1][1] = '1');
-
-      g_Console_Add(Format('d_frames is %d', [Byte(g_Debug_Frames)]));
-    end
     else if cmd = 'd_winmsg' then
     begin
       if (Length(P) > 1) and
@@ -5980,7 +5958,7 @@ begin
   else if cmd = 'screenshot' then
   begin
     {$IFDEF ENABLE_RENDER}
-      g_TakeScreenShot;
+      r_Render_RequestScreenShot;
     {$ENDIF}
   end
   else if (cmd = 'weapnext') or (cmd = 'weapprev') then
@@ -6314,29 +6292,6 @@ begin
   end;
 end;
 
-{$IFDEF ENABLE_RENDER}
-procedure g_TakeScreenShot(Filename: string = '');
-  var t: TDateTime; dir, date, name: String;
-begin
-  if e_NoGraphics then
-    Exit;
-
-  dir := e_GetWriteableDir(ScreenshotDirs);
-  if Filename = '' then
-  begin
-    t := Now;
-    DateTimeToString(date, 'yyyy-mm-dd-hh-nn-ss', t);
-    Filename := 'screenshot-' + date;
-  end;
-
-  name := e_CatPath(dir, Filename + '.png');
-  if r_Render_WriteScreenShot(name) then
-    g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [name]))
-  else
-    g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [name]));
-end;
-{$ENDIF}
-
 {$IFDEF ENABLE_MENU}
 procedure g_Game_InGameMenu(Show: Boolean);
 begin