diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 9cd3cbf59e4c1d27723e4b664b0a4c13e11a80ce..420ef52ecedd2e51f9e8d0d5ec33bd1d07053f0e 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;
- gWeaponAutoswitch: 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;
gsMaxLives: Byte;
gsPlayers: Byte;
gsGameFlags: LongWord;
implementation
uses
implementation
uses
- {$INCLUDE ../nogl/noGLuses.inc}
{$IFDEF USE_SDL2}
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,
{$IFDEF USE_SDL2}
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_items, wadreader, e_graphics, g_touch, envvars, g_system;
+ g_items, wadreader, r_graphics, g_touch, envvars, g_system;
var
machine: Integer;
var
machine: Integer;
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;
- gWeaponAutoswitch := 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;
gsMaxLives := 0;
gsPlayers := 1;
gsSpawnInvul := 0;
g_Options_ApplyGameSettings;
(* section MasterServer *)
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;