X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_options.pas;h=f15e7c7718e8568906c3afea23ba9ed108daf5d6;hb=414f2873efa0cce84499f64774db7000e6268971;hp=f889ea36e6e63f42154783ab7de5d3ae21145ad4;hpb=4171d8dd0b8d733da27c584616e431811bf0fdcf;p=d2df-sdl.git

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index f889ea3..f15e7c7 100644
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -22,7 +22,8 @@ uses
 
 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);
@@ -91,6 +92,7 @@ var
   gSFSFastMode: Boolean;
   gDefaultMegawadStart: AnsiString;
   gBerserkAutoswitch: Boolean;
+  glNPOTOverride: Boolean = false;
 
 implementation
 
@@ -182,7 +184,6 @@ end;
 {$ELSE}
 procedure g_Options_SetDefaultVideo;
 begin
-  {$WARNING stub}
   gScreenWidth := 640;
   gScreenHeight := 480;
   gBPP := 32;
@@ -297,7 +298,7 @@ begin
   (* 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';
@@ -381,7 +382,7 @@ begin
   ReadInteger(gFreq, 'Freq', 0);
   ReadBoolean(gVSync, 'VSync');
   ReadBoolean(gTextureFilter, 'TextureFilter');
-  ReadBoolean(glLegacyNPOT, 'LegacyCompatible');
+  ReadBoolean(glNPOTOverride, 'LegacyCompatibleForce');
 
   section := 'Sound';
   ReadBoolean(gNoSound, 'NoSound');
@@ -519,7 +520,8 @@ begin
   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');
@@ -564,7 +566,7 @@ begin
   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);
@@ -656,6 +658,7 @@ begin
 
   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);