X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=d154de12aeae754b74799e77ed84b0ea8181e862;hp=091935cb80b2b0eab96233a1680de41741e381a2;hb=ee8869fcffe670c84a83113811ab486e703ef029;hpb=be2ad7bf5e09b4ee91a0c5ee741503ace8c7887c

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 091935c..d154de1 100644
--- 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;
@@ -59,7 +62,6 @@ var
   gsSDLSampleRate: Integer;
   gsSDLBufferSize: Integer;
   gDefaultMegawadStart: AnsiString;
-  gBerserkAutoswitch: Boolean;
   glNPOTOverride: Boolean = false;
 
   (* Latched game settings *)
@@ -251,7 +253,6 @@ begin
   wadoptFast := False;
   e_FastScreenshots := True;
   gDefaultMegawadStart := DF_Default_Megawad_Start;
-  gBerserkAutoswitch := True;
   g_dbg_scale := 1.0;
   gSaveStats := False;
 
@@ -267,11 +268,16 @@ 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 or
+    GAME_OPTION_ALLOWDROPFLAG;
   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, terminalcorner.ru:25665';
   g_Net_Slist_Set(NetMasterList);
 
   (* section Server *)
@@ -327,6 +333,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, '', '');