added ForwardPorts config option

[d2df-sdl.git] / src / game / g_options.pas

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 37aac9da3d198269795ff608afd161a840d84d41..c43da69ec21d1e7cc87a36027c559a288d225e37 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -1,4 +1,4 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -147,6 +147,7 @@ begin
   gMuteWhenInactive := False;
   gAnnouncer := ANNOUNCE_MEPLUS;
   gSoundEffectsDF := True;
+  gUseChatSounds := True;
   g_GFX_SetMax(2000);
   g_Gibs_SetMax(150);
   g_Corpses_SetMax(20);
@@ -251,6 +252,7 @@ begin
   end;
 
   NetUseMaster := True;
+  NetForwardPorts := False;
   g_Net_Slist_Set('mpms.doom2d.org', 25665);
 end;
 
@@ -312,6 +314,7 @@ begin
   gMuteWhenInactive := config.ReadBool('Sound', 'MuteInactive', False);
   gAnnouncer := Min(Max(config.ReadInt('Sound', 'Announcer', ANNOUNCE_MEPLUS), ANNOUNCE_NONE), ANNOUNCE_ALL);
   gSoundEffectsDF := config.ReadBool('Sound', 'SoundEffectsDF', True);
+  gUseChatSounds := config.ReadBool('Sound', 'ChatSounds', True);
   gsSDLSampleRate := Min(Max(config.ReadInt('Sound', 'SDLSampleRate', 44100), 11025), 96000);
   gsSDLBufferSize := Min(Max(config.ReadInt('Sound', 'SDLBufferSize', 2048), 64), 16384);
 
@@ -436,8 +439,8 @@ begin
   gSFSFastMode := config.ReadBool('Game', 'SFSFastMode', False);
   wadoptFast := gSFSFastMode;
   e_FastScreenshots := config.ReadBool('Game', 'FastScreenshots', True);
-  gDefaultMegawadStart := config.ReadStr('Game', 'DefaultMegawadStart', 'megawads/DOOM2D.WAD:\MAP01');
-  gBerserkAutoswitch := config.ReadBool('Game', 'BerserkAutoswitch', False);
+  gDefaultMegawadStart := config.ReadStr('Game', 'DefaultMegawadStart', DF_Default_Megawad_Start);
+  gBerserkAutoswitch := config.ReadBool('Game', 'BerserkAutoswitching', True);
 
 // Ãåéìïëåé â ñâîåé èãðå
   gcMap := config.ReadStr('GameplayCustom', 'Map', '');
@@ -508,6 +511,7 @@ begin
   NetUpdateRate := Max(0, config.ReadInt('Server', 'UpdateInterval', 0));
   NetRelupdRate := Max(0, config.ReadInt('Server', 'ReliableUpdateInterval', 18));
   NetMasterRate := Max(1, config.ReadInt('Server', 'MasterSyncInterval', 60000));
+  NetForwardPorts := config.ReadBool('Server', 'ForwardPorts', False);
 
 // Êëèåíò
   NetInterpLevel := Max(0, config.ReadInt('Client', 'InterpolationSteps', 2));
@@ -559,6 +563,7 @@ begin
   config.WriteBool('Sound', 'MuteInactive', gMuteWhenInactive);
   config.WriteInt('Sound', 'Announcer', gAnnouncer);
   config.WriteBool('Sound', 'SoundEffectsDF', gSoundEffectsDF);
+  config.WriteBool('Sound', 'ChatSounds', gUseChatSounds);
   config.WriteInt('Sound', 'SDLSampleRate', gsSDLSampleRate);
   config.WriteInt('Sound', 'SDLBufferSize', gsSDLBufferSize);
 
@@ -672,7 +677,7 @@ begin
   config.WriteBool('Game', 'SFSFastMode', gSFSFastMode);
   config.WriteBool('Game', 'FastScreenshots', e_FastScreenshots);
   config.WriteStr('Game', 'DefaultMegawadStart', gDefaultMegawadStart);
-  config.WriteBool('Game', 'BerserkAutoswitch', gBerserkAutoswitch);
+  config.WriteBool('Game', 'BerserkAutoswitching', gBerserkAutoswitch);
 
   config.WriteStr ('GameplayCustom', 'Map', gcMap);
   config.WriteStr ('GameplayCustom', 'GameMode', gcGameMode);
@@ -708,6 +713,7 @@ begin
   config.WriteBool('Server', 'RCON', NetAllowRCON);
   config.WriteStr ('Server', 'RCONPassword', NetRCONPassword);
   config.WriteBool('Server', 'SyncWithMaster', NetUseMaster);
+  config.WriteBool('Server', 'ForwardPorts', NetForwardPorts);
   config.WriteInt ('Server', 'UpdateInterval', NetUpdateRate);
   config.WriteInt ('Server', 'ReliableUpdateInterval', NetRelupdRate);
   config.WriteInt ('Server', 'MasterSyncInterval', NetMasterRate);
@@ -826,6 +832,7 @@ begin
   config.WriteInt ('Server', 'Port', NetPort);
   config.WriteInt ('Server', 'MaxClients', NetMaxClients);
   config.WriteBool('Server', 'SyncWithMaster', NetUseMaster);
+  config.WriteBool('Server', 'ForwardPorts', NetForwardPorts);
 
   config.SaveFile(FileName);
   config.Free();