X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=23bb91b30ed9ae2b1aaf091ba2d48f369c8f0e66;hb=e1f115c17f5d486849c6c113ca0ea19e3eb2a2cc;hp=40249435823f84d3693ad06249082e669eefcc1f;hpb=94590b18ecb2eeb8b0527d1eee20c7f85ada60b7;p=d2df-sdl.git

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 4024943..23bb91b 100644
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -74,7 +74,9 @@ var
   gsGameFlags: LongWord;
   gsSpawnInvul: Integer = 0;
   gsItemRespawnTime: Word = 60;
-  gsRulezTimeMultiplier: Word = 60;
+  gsItemRespawnRandom: Word = 0;
+  gsRulezRespawnTime: Word = 60;
+  gsRulezRespawnRandom: 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;
@@ -268,11 +270,13 @@ begin
   gsPlayers := 1;
   gsSpawnInvul := 0;
   gsItemRespawnTime := 60;
-  gsRulezTimeMultiplier := 60;
+  gsItemRespawnRandom := 0;
+  gsRulezRespawnTime := 60;
+  gsRulezRespawnRandom := 0;
   gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
     GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
     GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE or
-    GAME_OPTION_ALLOWDROPFLAG or GAME_OPTION_RULEZRANDOM;
+    GAME_OPTION_ALLOWDROPFLAG;
   gsPlayers := 1;
 
   if not gGameOn then
@@ -317,7 +321,9 @@ begin
     MaxLives := gsMaxLives;
     SpawnInvul := gsSpawnInvul;
     ItemRespawnTime := gsItemRespawnTime;
-    RulezTimeMultiplier := gsRulezTimeMultiplier;
+    ItemRespawnRandom := gsItemRespawnRandom;
+    RulezRespawnTime := gsRulezRespawnTime;
+    RulezRespawnRandom := gsRulezRespawnRandom;
     WarmupTime := gsWarmupTime;
     Options := gsGameFlags;
   end;