render: move e_texture -> r_texture

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

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 5bfedc9d42b8f79e6c351c7ca8e686fd61aa403a..308751bd1ee0907a5f3553e636d9a4fbeaf43ed1 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -68,7 +68,7 @@ var
   gsMap: String;
   gsGameMode: String;
   gsTimeLimit: Word;
-  gsGoalLimit: Word;
+  gsScoreLimit: Word;
   gsMaxLives: Byte;
   gsPlayers: Byte;
   gsGameFlags: LongWord;
@@ -76,16 +76,24 @@ var
   gsItemRespawnTime: Word = 60;
   gsWarmupTime: Word = 30;
 
+{$IFDEF HEADLESS}
+  e_NoGraphics: Boolean = True;
+{$ELSE}
+  e_NoGraphics: Boolean = False;
+{$ENDIF}
+  e_FastScreenshots: Boolean = true; // it's REALLY SLOW with `false`
+  g_dbg_scale: Single = 1.0;
+  r_pixel_scale: Single = 1.0;
+
 implementation
 
 uses
-  {$INCLUDE ../nogl/noGLuses.inc}
   {$IFDEF USE_SDL2}
     SDL2,
   {$ENDIF}
   e_log, e_input, g_console, g_window, g_sound, g_gfx, g_player, Math,
-  g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main, e_texture,
-  g_items, wadreader, e_graphics, g_touch, envvars, g_system;
+  g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main,
+  g_items, wadreader, g_touch, envvars, g_system;
 
   var
     machine: Integer;
@@ -262,7 +270,7 @@ begin
   gsMap := '';
   gsGameMode := _lc[I_MENU_GAME_TYPE_DM];
   gsTimeLimit := 0;
-  gsGoalLimit := 0;
+  gsScoreLimit := 0;
   gsMaxLives := 0;
   gsPlayers := 1;
   gsSpawnInvul := 0;
@@ -311,7 +319,7 @@ begin
     if GameMode = GM_SINGLE then
       GameMode := GM_COOP;
     TimeLimit := gsTimeLimit;
-    GoalLimit := gsGoalLimit;
+    ScoreLimit := gsScoreLimit;
     MaxLives := gsMaxLives;
     SpawnInvul := gsSpawnInvul;
     ItemRespawnTime := gsItemRespawnTime;
@@ -334,6 +342,8 @@ initialization
   conRegVar('r_texfilter', @gTextureFilter, '', '');
   conRegVar('r_npot', @glNPOTOverride, '', '');
   conRegVar('r_interp', @gLerpActors, '', 'interpolate actors');
+  conRegVar('r_scale', @g_dbg_scale, 0.01, 100.0, 'render scale', '',  false);
+  conRegVar('r_resolution_scale', @r_pixel_scale, 0.01, 100.0, 'upscale factor', '', false);
 
   (* Sound *)
   conRegVar('s_nosound', @gNoSound, '', '');