game: ... but only if we're not in game right now

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

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 091935cb80b2b0eab96233a1680de41741e381a2..59028f5534bb6772957420c8071eacb21605d3be 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -38,6 +38,9 @@ var
   glLegacyNPOT: Boolean;
   glRenderToFBO: Boolean = True;
   gTextureFilter: Boolean;
+  gLerpActors: Boolean = True;
+  gFrameTime: Integer = 5;
+  gMaxFPS: Integer = 200;
   gNoSound: Boolean;
   gSoundLevel: Integer;
   gMusicLevel: Integer;
@@ -267,11 +270,15 @@ begin
   gsSpawnInvul := 0;
   gsItemRespawnTime := 60;
   gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
-    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER;
+    GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
+    GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
   gsPlayers := 1;
 
+  if not gGameOn then
+    g_Options_ApplyGameSettings;
+
   (* section MasterServer *)
-  NetMasterList := 'mpms.doom2d.org:25665,deadsoftware.ru:25665';
+  NetMasterList := 'mpms.doom2d.org:25665, deadsoftware.ru:25665';
   g_Net_Slist_Set(NetMasterList);
 
   (* section Server *)
@@ -327,6 +334,7 @@ initialization
   conRegVar('r_vsync', @gVSync, '', '');
   conRegVar('r_texfilter', @gTextureFilter, '', '');
   conRegVar('r_npot', @glNPOTOverride, '', '');
+  conRegVar('r_interp', @gLerpActors, '', 'interpolate actors');
 
   (* Sound *)
   conRegVar('s_nosound', @gNoSound, '', '');