diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 59028f5534bb6772957420c8071eacb21605d3be..23bb91b30ed9ae2b1aaf091ba2d48f369c8f0e66 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
gsSDLSampleRate: Integer;
gsSDLBufferSize: Integer;
gDefaultMegawadStart: AnsiString;
gsSDLSampleRate: Integer;
gsSDLBufferSize: Integer;
gDefaultMegawadStart: AnsiString;
- gBerserkAutoswitch: Boolean;
glNPOTOverride: Boolean = false;
(* Latched game settings *)
gsMap: String;
gsGameMode: String;
gsTimeLimit: Word;
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;
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
gsWarmupTime: Word = 30;
implementation
if Result = '' then
Result := 'Player' + IntToStr(machine MOD 10000);
if n = 1 then
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;
else
Result := Copy(Result, 1, 10) + ' ' + IntToStr(n)
end;
gScreenHeight := 480;
gWinSizeX := 640;
gWinSizeY := 480;
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? *)
gBPP := 32;
{$IFDEF ANDROID}
gFullScreen := True; (* rotation not allowed? *)
wadoptFast := False;
e_FastScreenshots := True;
gDefaultMegawadStart := DF_Default_Megawad_Start;
wadoptFast := False;
e_FastScreenshots := True;
gDefaultMegawadStart := DF_Default_Megawad_Start;
- gBerserkAutoswitch := True;
g_dbg_scale := 1.0;
gSaveStats := False;
g_dbg_scale := 1.0;
gSaveStats := False;
gsMap := '';
gsGameMode := _lc[I_MENU_GAME_TYPE_DM];
gsTimeLimit := 0;
gsMap := '';
gsGameMode := _lc[I_MENU_GAME_TYPE_DM];
gsTimeLimit := 0;
- gsGoalLimit := 0;
+ gsScoreLimit := 0;
gsMaxLives := 0;
gsPlayers := 1;
gsSpawnInvul := 0;
gsItemRespawnTime := 60;
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
gsGameFlags := GAME_OPTION_ALLOWEXIT or GAME_OPTION_DMKEYS or
GAME_OPTION_BOTVSPLAYER or GAME_OPTION_BOTVSMONSTER or
- GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE;
+ GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMHITPROJECTILE or
+ GAME_OPTION_ALLOWDROPFLAG;
gsPlayers := 1;
if not gGameOn then
g_Options_ApplyGameSettings;
(* section MasterServer *)
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 *)
g_Net_Slist_Set(NetMasterList);
(* section Server *)
if GameMode = GM_SINGLE then
GameMode := GM_COOP;
TimeLimit := gsTimeLimit;
if GameMode = GM_SINGLE then
GameMode := GM_COOP;
TimeLimit := gsTimeLimit;
- GoalLimit := gsGoalLimit;
+ ScoreLimit := gsScoreLimit;
MaxLives := gsMaxLives;
SpawnInvul := gsSpawnInvul;
ItemRespawnTime := gsItemRespawnTime;
MaxLives := gsMaxLives;
SpawnInvul := gsSpawnInvul;
ItemRespawnTime := gsItemRespawnTime;
+ ItemRespawnRandom := gsItemRespawnRandom;
+ RulezRespawnTime := gsRulezRespawnTime;
+ RulezRespawnRandom := gsRulezRespawnRandom;
WarmupTime := gsWarmupTime;
Options := gsGameFlags;
end;
WarmupTime := gsWarmupTime;
Options := gsGameFlags;
end;