X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=22ebe3e26e0da9f644d2bf142a33159a34350ec1;hb=67d37ea13feeca0671d60d88b1963cf1e0e901c4;hp=f7830d74e73228fa67b4bbbe8ed25337ce0afa82;hpb=cb61300b61ba18d486d19edf315f05b5b494fac3;p=d2df-sdl.git

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index f7830d7..22ebe3e 100644
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -62,19 +62,21 @@ var
   gsSDLSampleRate: Integer;
   gsSDLBufferSize: Integer;
   gDefaultMegawadStart: AnsiString;
-  gBerserkAutoswitch: Boolean;
   glNPOTOverride: Boolean = false;
 
   (* Latched game settings *)
   gsMap: String;
   gsGameMode: String;
   gsTimeLimit: Word;
-  gsGoalLimit: Word;
+  gsScoreLimit: Word;
   gsMaxLives: Byte;
   gsPlayers: Byte;
   gsGameFlags: LongWord;
   gsSpawnInvul: Integer = 0;
   gsItemRespawnTime: Word = 60;
+  gsItemRespawnRandom: Word = 0;
+  gsPowerupRespawnTime: Word = 60;
+  gsPowerupRespawnRandom: Word = 0;
   gsWarmupTime: Word = 30;
 
 implementation
@@ -98,7 +100,7 @@ uses
     if Result = '' then
       Result := 'Player' + IntToStr(machine MOD 10000);
     if n = 1 then
-      Result := Copy(Result, 1, 12) + ' '
+      Result := Copy(Result, 1, 12)
     else
       Result := Copy(Result, 1, 10) + ' ' + IntToStr(n)
   end;
@@ -115,7 +117,7 @@ begin
   gScreenHeight := 480;
   gWinSizeX := 640;
   gWinSizeY := 480;
-  //gBPP := SDL_BITSPERPIXEL(dispaly.format);
+  //gBPP := SDL_BITSPERPIXEL(display.format);
   gBPP := 32;
   {$IFDEF ANDROID}
     gFullScreen := True; (* rotation not allowed? *)
@@ -254,7 +256,6 @@ begin
   wadoptFast := False;
   e_FastScreenshots := True;
   gDefaultMegawadStart := DF_Default_Megawad_Start;
-  gBerserkAutoswitch := True;
   g_dbg_scale := 1.0;
   gSaveStats := False;
 
@@ -264,17 +265,25 @@ begin
   gsMap := '';
   gsGameMode := _lc[I_MENU_GAME_TYPE_DM];
   gsTimeLimit := 0;
-  gsGoalLimit := 0;
+  gsScoreLimit := 0;
   gsMaxLives := 0;
   gsPlayers := 1;
   gsSpawnInvul := 0;
   gsItemRespawnTime := 60;
+  gsItemRespawnRandom := 0;
+  gsPowerupRespawnTime := 60;
+  gsPowerupRespawnRandom := 0;
   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 *)
@@ -291,6 +300,7 @@ begin
   NetForwardPorts := False;
 
   (* section Client *)
+  NetInterpLevel := 2;
   NetForcePlayerUpdate := False;
   NetPredictSelf := True;
   NetClientIP := '127.0.0.1';
@@ -307,10 +317,13 @@ begin
     if GameMode = GM_SINGLE then
       GameMode := GM_COOP;
     TimeLimit := gsTimeLimit;
-    GoalLimit := gsGoalLimit;
+    ScoreLimit := gsScoreLimit;
     MaxLives := gsMaxLives;
     SpawnInvul := gsSpawnInvul;
     ItemRespawnTime := gsItemRespawnTime;
+    ItemRespawnRandom := gsItemRespawnRandom;
+    PowerupRespawnTime := gsPowerupRespawnTime;
+    PowerupRespawnRandom := gsPowerupRespawnRandom;
     WarmupTime := gsWarmupTime;
     Options := gsGameFlags;
   end;