diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 116e6474fd136810e16de5b09963901a06c7b65b..7aea70fc0a5f9add839ce28ab3bfe334a975fc9f 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
function GenPlayerName (n: Integer): String;
-procedure g_Options_SetDefault();
+procedure g_Options_SetDefault;
+procedure g_Options_SetDefaultVideo;
procedure g_Options_Read(FileName: String);
procedure g_Options_Write(FileName: String);
procedure g_Options_Write_Language(FileName: String);
gSFSFastMode: Boolean;
gDefaultMegawadStart: AnsiString;
gBerserkAutoswitch: Boolean;
+ glNPOTOverride: Boolean = false;
implementation
{$IFDEF USE_SDL2}
procedure g_Options_SetDefaultVideo;
-var
- target, closest, display: TSDL_DisplayMode;
- percentage: Integer;
+ var display: TSDL_DisplayMode;
+ {$IFNDEF ANDROID}
+ var target, closest: TSDL_DisplayMode; percentage: Integer;
+ {$ENDIF}
begin
(* Display 0 = Primary display *)
gScreenWidth := 640;
(* section MasterServer *)
NetSlistIP := 'mpms.doom2d.org';
NetSlistPort := 25665;
- g_Net_Slist_Set(NetSlistIP, NetSlistPort);
+ g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
(* section Server *)
NetServerName := 'Unnamed Server';
ReadInteger(gFreq, 'Freq', 0);
ReadBoolean(gVSync, 'VSync');
ReadBoolean(gTextureFilter, 'TextureFilter');
- ReadBoolean(glLegacyNPOT, 'LegacyCompatible');
+ ReadBoolean(glNPOTOverride, 'LegacyCompatibleForce');
section := 'Sound';
ReadBoolean(gNoSound, 'NoSound');
section := 'MasterServer';
ReadString(NetSlistIP, 'IP');
ReadInteger(NetSlistPort, 'Port', 0, 65535);
- g_Net_Slist_Set(NetSlistIP, NetSlistPort);
+ ReadString(NetSlistList, 'List');
+ g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
section := 'Server';
ReadString(NetServerName, 'Name');
config.WriteInt('Video', 'BPP', gBPP);
config.WriteBool('Video', 'VSync', gVSync);
config.WriteBool('Video', 'TextureFilter', gTextureFilter);
- config.WriteBool('Video', 'LegacyCompatible', glLegacyNPOT);
+ config.WriteBool('Video', 'LegacyCompatibleForce', glNPOTOverride);
config.WriteBool('Sound', 'NoSound', gNoSound);
config.WriteInt('Sound', 'SoundLevel', gSoundLevel);
config.WriteStr('MasterServer', 'IP', NetSlistIP);
config.WriteInt('MasterServer', 'Port', NetSlistPort);
+ config.WriteStr('MasterServer', 'List', NetSlistList);
config.WriteStr ('Server', 'Name', NetServerName);
config.WriteStr ('Server', 'Password', NetPassword);