diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index d154de12aeae754b74799e77ed84b0ea8181e862..79da12ec4439c1e57f490e504481e15ce2bf730a 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
interface
uses
- g_language, g_weapons, utils;
+ g_language, g_game, g_weapons, utils;
function GenPlayerName (n: Integer): String;
gsMap: String;
gsGameMode: String;
gsTimeLimit: Word;
- gsGoalLimit: Word;
+ gsScoreLimit: Word;
gsMaxLives: Byte;
gsPlayers: Byte;
- gsGameFlags: LongWord;
+ gsGameFlags: TGameOptions;
gsSpawnInvul: Integer = 0;
gsItemRespawnTime: Word = 60;
+ gsItemRespawnRandom: Word = 0;
+ gsPowerupRespawnTime: Word = 60;
+ gsPowerupRespawnRandom: Word = 0;
gsWarmupTime: Word = 30;
implementation
SDL2,
{$ENDIF}
e_log, e_input, g_console, g_window, g_sound, g_gfx, g_player, Math,
- g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main, e_texture,
+ g_map, g_net, g_netmaster, SysUtils, CONFIG, g_main, e_texture,
g_items, wadreader, e_graphics, g_touch, envvars, g_system;
var
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;
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? *)
gsMap := '';
gsGameMode := _lc[I_MENU_GAME_TYPE_DM];
gsTimeLimit := 0;
- gsGoalLimit := 0;
+ gsScoreLimit := 0;
gsMaxLives := 0;
gsPlayers := 1;
gsSpawnInvul := 0;
gsItemRespawnTime := 60;
- 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;
+ gsItemRespawnRandom := 0;
+ gsPowerupRespawnTime := 60;
+ gsPowerupRespawnRandom := 0;
+ gsGameFlags := [TGameOption.ALLOW_EXIT, TGameOption.DM_KEYS, TGameOption.BOTS_VS_PLAYERS,
+ TGameOption.BOTS_VS_MONSTERS, TGameOption.TEAM_HIT_TRACE, TGameOption.TEAM_HIT_PROJECTILE,
+ TGameOption.ALLOW_DROP_FLAG];
gsPlayers := 1;
if not gGameOn then
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;