X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=93e9199a211d2f4c40a03531898b8f49667f734b;hb=2f57c630d9545543d340f9dbcc516cc64c260f0f;hp=5bfedc9d42b8f79e6c351c7ca8e686fd61aa403a;hpb=b1e7f99d9eea1711acf7471e9827500acccc5820;p=d2df-sdl.git diff --git a/src/game/g_options.pas b/src/game/g_options.pas index 5bfedc9..93e9199 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -68,12 +68,15 @@ var 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; + gsRulezRespawnTime: Word = 60; + gsRulezRespawnRandom: Word = 0; gsWarmupTime: Word = 30; implementation @@ -262,11 +265,14 @@ 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; + 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 @@ -311,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; + RulezRespawnTime := gsRulezRespawnTime; + RulezRespawnRandom := gsRulezRespawnRandom; WarmupTime := gsWarmupTime; Options := gsGameFlags; end;