diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index b308b04304e9d013507137caee35eb35ccb0791f..7aea70fc0a5f9add839ce28ab3bfe334a975fc9f 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
-{$MODE DELPHI}
+(* 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
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$INCLUDE ../shared/a_modes.inc}
unit g_options;
interface
uses
unit g_options;
interface
uses
- g_language;
-
-type
- TPlayerControl = record
- KeyRight: Word;
- KeyLeft: Word;
- KeyUp: Word;
- KeyDown: Word;
- KeyFire: Word;
- KeyJump: Word;
- KeyNextWeapon: Word;
- KeyPrevWeapon: Word;
- KeyOpen: Word;
- end;
-
- TGameControls = record
- TakeScreenshot: Word;
- Stat: Word;
- Chat: Word;
- TeamChat: Word;
- end;
+ g_language, g_weapons;
- TControls = record
- GameControls: TGameControls;
- P1Control: TPlayerControl;
- P2Control: TPlayerControl;
- end;
+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);
procedure g_Options_Read(FileName: String);
procedure g_Options_Write(FileName: String);
procedure g_Options_Write_Language(FileName: String);
procedure g_Options_Write_Net_Server(FileName: String);
procedure g_Options_Write_Net_Client(FileName: String);
procedure g_Options_Write_Net_Server(FileName: String);
procedure g_Options_Write_Net_Client(FileName: String);
+const DF_Default_Megawad_Start = 'megawads/DOOM2D.WAD:\MAP01';
+
var
var
- gGameControls: TControls;
- gScreenWidth: Word = 800;
- gScreenHeight: Word = 600;
- gWinRealPosX: Integer = 0;
- gWinRealPosY: Integer = 0;
- gBPP: Byte = 32;
- gFreq: Byte = 0;
- gFullscreen: Boolean = False;
- gWinMaximized: Boolean = False;
- gVSync: Boolean = False;
- glLegacyNPOT: Boolean = False;
- gTextureFilter: Boolean = True;
- gNoSound: Boolean = False;
- gSoundLevel: Byte = 75;
- gMusicLevel: Byte = 65;
- gMaxSimSounds: Byte = 8;
- gMuteWhenInactive: Boolean = False;
- gAdvCorpses: Boolean = True;
- gAdvBlood: Boolean = True;
- gAdvGibs: Boolean = True;
- gGibsCount: Integer = 32;
- gBloodCount: Byte = 3;
- gFlash: Byte = 1;
- gDrawBackGround: Boolean = True;
- gShowMessages: Boolean = True;
- gRevertPlayers: Boolean = False;
- gLanguage: String = LANGUAGE_ENGLISH;
- gAskLanguage: Boolean = True;
- gcMap: String = '';
- gcGameMode: String = '';
- gcTimeLimit: Word = 0;
- gcGoalLimit: Word = 0;
- gcMaxLives: Byte = 0;
- gcPlayers: Byte = 1;
- gcTeamDamage: Boolean = False;
- gcAllowExit: Boolean = True;
- gcWeaponStay: Boolean = False;
- gcMonsters: Boolean = False;
- gcBotsVS: String = 'Everybody';
- gnMap: String = '';
- gnGameMode: String = '';
- gnTimeLimit: Word = 0;
- gnGoalLimit: Word = 0;
- gnMaxLives: Byte = 0;
- gnPlayers: Byte = 1;
- gnTeamDamage: Boolean = False;
- gnAllowExit: Boolean = True;
- gnWeaponStay: Boolean = False;
- gnMonsters: Boolean = False;
- gnBotsVS: String = 'Everybody';
- gsSDLSampleRate: Integer = 44100;
- gsSDLBufferSize: Integer = 2048;
- gSFSDebug: Boolean = False;
- gSFSFastMode: Boolean = False;
+// gGameControls: TControls;
+ gScreenWidth: Word;
+ gScreenHeight: Word;
+ gWinRealPosX: Integer;
+ gWinRealPosY: Integer;
+ gBPP: Byte;
+ gFreq: Byte;
+ gFullscreen: Boolean;
+ gWinMaximized: Boolean;
+ gVSync: Boolean;
+ glLegacyNPOT: Boolean;
+ gTextureFilter: Boolean;
+ gNoSound: Boolean;
+ gSoundLevel: Byte;
+ gMusicLevel: Byte;
+ gMaxSimSounds: Byte;
+ gMuteWhenInactive: Boolean;
+ gAdvCorpses: Boolean;
+ gAdvBlood: Boolean;
+ gAdvGibs: Boolean;
+ gGibsCount: Integer;
+ gBloodCount: Byte;
+ gFlash: Byte;
+ gDrawBackGround: Boolean;
+ gShowMessages: Boolean;
+ gRevertPlayers: Boolean;
+ gLanguage: String;
+ gAskLanguage: Boolean;
+ gcMap: String;
+ gcGameMode: String;
+ gcTimeLimit: Word;
+ gcGoalLimit: Word;
+ gcMaxLives: Byte;
+ gcPlayers: Byte;
+ gcTeamDamage: Boolean;
+ gcAllowExit: Boolean;
+ gcWeaponStay: Boolean;
+ gcMonsters: Boolean;
+ gcBotsVS: String;
+ gnMap: String;
+ gnGameMode: String;
+ gnTimeLimit: Word;
+ gnGoalLimit: Word;
+ gnMaxLives: Byte;
+ gnPlayers: Byte;
+ gnTeamDamage: Boolean;
+ gnAllowExit: Boolean;
+ gnWeaponStay: Boolean;
+ gnMonsters: Boolean;
+ gnBotsVS: String;
+ gsSDLSampleRate: Integer;
+ gsSDLBufferSize: Integer;
+ gSFSDebug: Boolean;
+ gSFSFastMode: Boolean;
+ gDefaultMegawadStart: AnsiString;
+ gBerserkAutoswitch: Boolean;
+ glNPOTOverride: Boolean = false;
implementation
uses
implementation
uses
- e_log, e_input, g_window, g_sound, g_gfx, g_player, Math,
- g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game, g_main, e_textures,
- g_items, GL, GLExt;
+ {$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,
+ g_items, wadreader, e_graphics, g_touch, envvars;
+
+ var
+ machine: Integer;
+
+ function GenPlayerName (n: Integer): String;
+ begin
+ ASSERT(n >= 1);
+ Result := GetUserName;
+ if Result = '' then
+ Result := 'Player' + IntToStr(machine MOD 10000);
+ if n = 1 then
+ Result := Copy(Result, 1, 12) + ' '
+ else
+ Result := Copy(Result, 1, 10) + ' ' + IntToStr(n)
+ end;
+
+{$IFDEF USE_SDL2}
+procedure g_Options_SetDefaultVideo;
+ var display: TSDL_DisplayMode;
+ {$IFNDEF ANDROID}
+ var target, closest: TSDL_DisplayMode; percentage: Integer;
+ {$ENDIF}
+begin
+ (* Display 0 = Primary display *)
+ gScreenWidth := 640;
+ gScreenHeight := 480;
+ //gBPP := SDL_BITSPERPIXEL(dispaly.format);
+ gBPP := 32;
+ {$IFDEF ANDROID}
+ gFullScreen := True; (* rotation not allowed? *)
+ {$ELSE}
+ gFullScreen := False;
+ {$ENDIF}
+ if SDL_GetDesktopDisplayMode(0, @display) = 0 then
+ begin
+ {$IFDEF ANDROID}
+ gScreenWidth := display.w;
+ gScreenHeight := display.h;
+ {$ELSE}
+ (* Window must be smaller than display *)
+ closest.w := display.w;
+ closest.h := display.h;
+ percentage := 75;
+ while (display.w - closest.w < 48) or (display.h - closest.h < 48) do
+ begin
+ if percentage < 25 then
+ begin
+ closest.w := display.w * 75 div 100;
+ closest.h := display.h * 75 div 100;
+ break;
+ end;
+ target.w := display.w * percentage div 100;
+ target.h := display.h * percentage div 100;
+ target.format := 0; (* didn't care *)
+ target.refresh_rate := 0; (* didn't care *)
+ target.driverdata := nil; (* init *)
+ SDL_GetClosestDisplayMode(0, @target, @closest);
+ Dec(percentage);
+ end;
+ gScreenWidth := closest.w;
+ gScreenHeight := closest.h;
+ //gBPP := SDL_BITSPERPIXEL(closest.format); (* Resolution list didn't work for some reason *)
+ {$ENDIF}
+ end
+ else
+ begin
+ e_LogWritefln('SDL: Failed to get desktop display mode: %s', [SDL_GetError])
+ end;
+ (* Must be positioned on primary display *)
+ gWinRealPosX := SDL_WINDOWPOS_CENTERED;
+ gWinRealPosY := SDL_WINDOWPOS_CENTERED;
+ gWinMaximized := False;
+ gVSync := True;
+ gTextureFilter := True;
+ glLegacyNPOT := False;
+ e_LogWriteLn('g_Options_SetDefaultVideo: w = ' + IntToStr(gScreenWidth) + ' h = ' + IntToStr(gScreenHeight));
+ g_Console_ResetBinds;
+end;
+{$ELSE}
+procedure g_Options_SetDefaultVideo;
+begin
+ gScreenWidth := 640;
+ gScreenHeight := 480;
+ gBPP := 32;
+ gFullScreen := False;
+ gWinRealPosX := 0;
+ gWinRealPosY := 0;
+ gWinMaximized := False;
+ gVSync := True;
+ gTextureFilter := True;
+ glLegacyNPOT := False;
+ e_LogWriteLn('g_Options_SetDefaultVideo: w = ' + IntToStr(gScreenWidth) + ' h = ' + IntToStr(gScreenHeight));
+ g_Console_ResetBinds;
+end;
+{$ENDIF}
procedure g_Options_SetDefault();
var
i: Integer;
begin
procedure g_Options_SetDefault();
var
i: Integer;
begin
- g_Sound_SetupAllVolumes(75, 65);
+ (* section Sound *)
+ gNoSound := False;
+ gSoundLevel := 75;
+ gMusicLevel := 65;
gMaxSimSounds := 8;
gMuteWhenInactive := False;
gAnnouncer := ANNOUNCE_MEPLUS;
gSoundEffectsDF := True;
gMaxSimSounds := 8;
gMuteWhenInactive := False;
gAnnouncer := ANNOUNCE_MEPLUS;
gSoundEffectsDF := True;
- g_GFX_SetMax(2000);
- g_Gibs_SetMax(150);
- g_Corpses_SetMax(20);
- g_Shells_SetMax(300);
- gGibsCount := 32;
- gBloodCount := 3;
- gAdvBlood := True;
- gAdvCorpses := True;
- gAdvGibs := True;
- gFlash := 1;
- gDrawBackGround := True;
- gShowMessages := True;
- gRevertPlayers := False;
-
- for i := 0 to e_MaxJoys-1 do
- e_JoystickDeadzones[i] := 8192;
+ gUseChatSounds := True;
+ gsSDLSampleRate := 44100;
+ gsSDLBufferSize := 2048;
- with gGameControls.GameControls do
- begin
- TakeScreenshot := 183;
- Stat := 15;
- Chat := 20; // [T]
- TeamChat := 21; // [Y]
- end;
-
- with gGameControls.P1Control do
- begin
- KeyRight := 77;
- KeyLeft := 75;
- KeyUp := 72;
- KeyDown := 76;
- KeyFire := 184;
- KeyJump := 157;
- KeyNextWeapon := 73;
- KeyPrevWeapon := 71;
- KeyOpen := 54;
- end;
-
- with gGameControls.P2Control do
- begin
- KeyRight := 33;
- KeyLeft := 31;
- KeyUp := 18;
- KeyDown := 32;
- KeyFire := 30;
- KeyJump := 16;
- KeyNextWeapon := 19;
- KeyPrevWeapon := 17;
- KeyOpen := 58;
- end;
+ g_Sound_SetupAllVolumes(gSoundLevel, gMusicLevel);
with gPlayer1Settings do
begin
with gPlayer1Settings do
begin
- Name := 'Player1';
+ Name := GenPlayerName(1);
Model := STD_PLAYER_MODEL;
Color.R := PLAYER1_DEF_COLOR.R;
Color.G := PLAYER1_DEF_COLOR.G;
Model := STD_PLAYER_MODEL;
Color.R := PLAYER1_DEF_COLOR.R;
Color.G := PLAYER1_DEF_COLOR.G;
with gPlayer2Settings do
begin
with gPlayer2Settings do
begin
- Name := 'Player2';
+ Name := GenPlayerName(2);
Model := STD_PLAYER_MODEL;
Color.R := PLAYER2_DEF_COLOR.R;
Color.G := PLAYER2_DEF_COLOR.G;
Model := STD_PLAYER_MODEL;
Color.R := PLAYER2_DEF_COLOR.R;
Color.G := PLAYER2_DEF_COLOR.G;
Team := TEAM_BLUE;
end;
Team := TEAM_BLUE;
end;
+ (* section Joysticks *)
+ for i := 0 to e_MaxJoys - 1 do
+ begin
+ e_JoystickDeadzones[i] := 8192
+ end;
+
+ (* section Game *)
+ g_GFX_SetMax(2000);
+ g_Shells_SetMax(300);
+ g_Gibs_SetMax(150);
+ g_Corpses_SetMax(20);
+ gGibsCount := 32;
+ ITEM_RESPAWNTIME := 60 * 36;
+ gBloodCount := 4;
+ gAdvBlood := True;
+ gAdvCorpses := True;
+ gAdvGibs := True;
+ gFlash := 1;
+ gDrawBackGround := True;
+ gShowMessages := True;
+ gRevertPlayers := False;
+ gChatBubble := 4;
+ gSFSDebug := False;
+ gSFSFastMode := False;
+ e_FastScreenshots := True;
+ gDefaultMegawadStart := DF_Default_Megawad_Start;
+ gBerserkAutoswitch := True;
+ g_dbg_scale := 1.0;
+
+ gAskLanguage := True;
+ gLanguage := LANGUAGE_ENGLISH;
+
+ (* section GameplayCustom *)
+ gcMap := '';
+ gcGameMode := _lc[I_MENU_GAME_TYPE_DM];
+ gcTimeLimit := 0;
+ gcGoalLimit := 0;
+ gcMaxLives := 0;
+ gcPlayers := 1;
+ gcTeamDamage := False;
+ gcAllowExit := True;
+ gcWeaponStay := False;
+ gcMonsters := False;
+ gcBotsVS := 'Everybody';
+
+ (* section GameplayNetwork *)
+ gnMap := '';
+ gnGameMode := _lc[I_MENU_GAME_TYPE_DM];
+ gnTimeLimit := 0;
+ gnGoalLimit := 0;
+ gnMaxLives := 0;
+ gnPlayers := 1;
+ gnTeamDamage := False;
+ gnAllowExit := True;
+ gnWeaponStay := False;
+ gnMonsters := False;
+ gnBotsVS := 'Everybody';
+
+ (* section MasterServer *)
+ NetSlistIP := 'mpms.doom2d.org';
+ NetSlistPort := 25665;
+ g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
+
+ (* section Server *)
+ NetServerName := 'Unnamed Server';
+ NetPassword := '';
+ NetPort := 25666;
+ NetMaxClients := 16;
+ NetAllowRCON := False;
+ NetRCONPassword := 'default';
NetUseMaster := True;
NetUseMaster := True;
- g_Net_Slist_Set('mpms.doom2d.org', 25665);
+ NetUpdateRate := 0;
+ NetRelupdRate := 18;
+ NetMasterRate := 60000;
+ NetForwardPorts := False;
+
+ (* section Client *)
+ NetInterpLevel := 2;
+ NetForcePlayerUpdate := False;
+ NetPredictSelf := True;
+ NetClientIP := '127.0.0.1';
+ NetClientPort := NetPort;
end;
procedure g_Options_Read(FileName: String);
var
end;
procedure g_Options_Read(FileName: String);
var
- config: TConfig;
- str: String;
i: Integer;
i: Integer;
-begin
- gAskLanguage := True;
- e_WriteLog('Reading config', MSG_NOTIFY);
-
- if not FileExists(FileName) then
+ config: TConfig;
+ section: String;
+
+ procedure ReadInteger (VAR v: Integer; param: String; minv: Integer = Low(Integer); maxv: Integer = High(Integer));
begin
begin
- e_WriteLog('Config file '+FileName+' not found', MSG_WARNING);
- g_Options_SetDefault();
-
- // Default video options:
- gScreenWidth := 800;
- gScreenHeight := 600;
- gWinRealPosX := 0;
- gWinRealPosY := 0;
- gWinMaximized := False;
- gFullScreen := False;
- gBPP := 32;
- gVSync := False;
- gTextureFilter := True;
- glLegacyNPOT := False;
+ v := Max(Min(config.ReadInt(section, param, v), maxv), minv)
+ end;
- Exit;
+ procedure ReadInteger (VAR v: LongWord; param: String; minv: LongWord = Low(LongWord); maxv: LongWord = High(LongWord)); overload;
+ begin
+ v := Max(Min(config.ReadInt(section, param, v), maxv), minv)
end;
end;
- config := TConfig.CreateFile(FileName);
+ procedure ReadInteger (VAR v: Word; param: String; minv: Word = Low(Word); maxv: Word = High(Word)); overload;
+ begin
+ v := Max(Min(config.ReadInt(section, param, v), maxv), minv)
+ end;
- gScreenWidth := config.ReadInt('Video', 'ScreenWidth', 800);
- if gScreenWidth < 640 then
- gScreenWidth := 640;
- gScreenHeight := config.ReadInt('Video', 'ScreenHeight', 600);
- if gScreenHeight < 480 then
- gScreenHeight := 480;
- gWinRealPosX := config.ReadInt('Video', 'WinPosX', 0);
- if gWinRealPosX < 0 then
- gWinRealPosX := 0;
- gWinRealPosY := config.ReadInt('Video', 'WinPosY', 0);
- if gWinRealPosY < 0 then
- gWinRealPosY := 0;
- gFullScreen := config.ReadBool('Video', 'Fullscreen', False);
- gWinMaximized := config.ReadBool('Video', 'Maximized', False);
- gBPP := config.ReadInt('Video', 'BPP', 32);
- gFreq := config.ReadInt('Video', 'Freq', 0);
- gVSync := config.ReadBool('Video', 'VSync', True);
- gTextureFilter := config.ReadBool('Video', 'TextureFilter', True);
- glLegacyNPOT := config.ReadBool('Video', 'LegacyCompatible', False);
-
- gNoSound := config.ReadBool('Sound', 'NoSound', False);
- gSoundLevel := Min(config.ReadInt('Sound', 'SoundLevel', 75), 255);
- gMusicLevel := Min(config.ReadInt('Sound', 'MusicLevel', 65), 255);
- gMaxSimSounds := Max(Min(config.ReadInt('Sound', 'MaxSimSounds', 8), 66), 2);
- 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);
- gsSDLSampleRate := Min(Max(config.ReadInt('Sound', 'SDLSampleRate', 44100), 11025), 96000);
- gsSDLBufferSize := Min(Max(config.ReadInt('Sound', 'SDLBufferSize', 2048), 64), 16384);
-
- with gGameControls.GameControls do
+ procedure ReadInteger (VAR v: Byte; param: String; minv: Byte = Low(Byte); maxv: Byte = High(Byte)); overload;
begin
begin
- TakeScreenshot := config.ReadInt('GameControls', 'TakeScreenshot', 183);
- Stat := config.ReadInt('GameControls', 'Stat', 15);
- Chat := config.ReadInt('GameControls', 'Chat', 20);
- TeamChat := config.ReadInt('GameControls', 'TeamChat', 21);
+ v := Max(Min(config.ReadInt(section, param, v), maxv), minv)
end;
end;
- with gGameControls.P1Control, config do
+ procedure ReadBoolean (VAR v: Boolean; param: String);
begin
begin
- KeyRight := ReadInt('Player1', 'KeyRight', 33);
- KeyLeft := ReadInt('Player1', 'KeyLeft', 31);
- KeyUp := ReadInt('Player1', 'KeyUp', 18);
- KeyDown := ReadInt('Player1', 'KeyDown', 32);
- KeyFire := ReadInt('Player1', 'KeyFire', 30);
- KeyJump := ReadInt('Player1', 'KeyJump', 16);
- KeyNextWeapon := ReadInt('Player1', 'KeyNextWeapon', 19);
- KeyPrevWeapon := ReadInt('Player1', 'KeyPrevWeapon', 17);
- KeyOpen := ReadInt('Player1', 'KeyOpen', 58);
+ v := config.ReadBool(section, param, v)
end;
end;
- with gPlayer1Settings, config do
+ procedure ReadString (VAR v: String; param: String);
begin
begin
- Name := ReadStr('Player1', 'name', 'Player1');
- Model := ReadStr('Player1', 'model', STD_PLAYER_MODEL);
- Color.R := Min(Abs(ReadInt('Player1', 'red', PLAYER1_DEF_COLOR.R)), 255);
- Color.G := Min(Abs(ReadInt('Player1', 'green', PLAYER1_DEF_COLOR.G)), 255);
- Color.B := Min(Abs(ReadInt('Player1', 'blue', PLAYER1_DEF_COLOR.B)), 255);
- Team := ReadInt('Player1', 'team', TEAM_RED);
- if (Team < TEAM_RED) or (Team > TEAM_BLUE) then
- Team := TEAM_RED;
+ v := config.ReadStr(section, param, v)
end;
end;
- with gGameControls.P2Control, config do
+begin
+ gAskLanguage := True;
+ e_WriteLog('Reading config', TMsgType.Notify);
+ g_Options_SetDefault;
+
+ if FileExists(FileName) = False then
begin
begin
- KeyRight := ReadInt('Player2', 'KeyRight', 205);
- KeyLeft := ReadInt('Player2', 'KeyLeft', 203);
- KeyUp := ReadInt('Player2', 'KeyUp', 200);
- KeyDown := ReadInt('Player2', 'KeyDown', 208);
- KeyFire := ReadInt('Player2', 'KeyFire', 184);
- KeyJump := ReadInt('Player2', 'KeyJump', 157);
- KeyNextWeapon := ReadInt('Player2', 'KeyNextWeapon', 73);
- KeyPrevWeapon := ReadInt('Player2', 'KeyPrevWeapon', 71);
- KeyOpen := ReadInt('Player2', 'KeyOpen', 54);
+ e_WriteLog('Config file '+FileName+' not found', TMsgType.Warning);
+ g_Options_SetDefaultVideo;
+ Exit
end;
end;
- with gPlayer2Settings, config do
+ config := TConfig.CreateFile(FileName);
+
+ section := 'Video';
+ ReadInteger(gScreenWidth, 'ScreenWidth', 0);
+ ReadInteger(gScreenHeight, 'ScreenHeight', 0);
+ ReadInteger(gWinRealPosX, 'WinPosX', 60);
+ ReadInteger(gWinRealPosY, 'WinPosY', 60);
+ ReadBoolean(gFullScreen, 'Fullscreen');
+ ReadBoolean(gWinMaximized, 'Maximized');
+ ReadInteger(gBPP, 'BPP', 0);
+ ReadInteger(gFreq, 'Freq', 0);
+ ReadBoolean(gVSync, 'VSync');
+ ReadBoolean(gTextureFilter, 'TextureFilter');
+ ReadBoolean(glNPOTOverride, 'LegacyCompatibleForce');
+
+ section := 'Sound';
+ ReadBoolean(gNoSound, 'NoSound');
+ ReadInteger(gSoundLevel, 'SoundLevel', 0, 255);
+ ReadInteger(gMusicLevel, 'MusicLevel', 0, 255);
+ ReadInteger(gMaxSimSounds, 'MaxSimSounds', 2, 66);
+ ReadBoolean(gMuteWhenInactive, 'MuteInactive');
+ ReadInteger(gAnnouncer, 'Announcer', ANNOUNCE_NONE, ANNOUNCE_ALL);
+ ReadBoolean(gSoundEffectsDF, 'SoundEffectsDF');
+ ReadBoolean(gUseChatSounds, 'ChatSounds');
+ ReadInteger(gsSDLSampleRate, 'SDLSampleRate', 11025, 96000);
+ ReadInteger(gsSDLBufferSize, 'SDLBufferSize', 64, 16384);
+
+ section := 'Player1';
+ with gPlayer1Settings do
begin
begin
- Name := ReadStr('Player2', 'name', 'Player2');
- Model := ReadStr('Player2', 'model', STD_PLAYER_MODEL);
- Color.R := Min(Abs(ReadInt('Player2', 'red', PLAYER2_DEF_COLOR.R)), 255);
- Color.G := Min(Abs(ReadInt('Player2', 'green', PLAYER2_DEF_COLOR.G)), 255);
- Color.B := Min(Abs(ReadInt('Player2', 'blue', PLAYER2_DEF_COLOR.B)), 255);
- Team := ReadInt('Player2', 'team', TEAM_BLUE);
+ ReadString(Name, 'name');
+ ReadString(Model, 'model');
+ ReadInteger(Color.R, 'red', 0, 255);
+ ReadInteger(Color.G, 'green', 0, 255);
+ ReadInteger(Color.B, 'blue', 0, 255);
+ ReadInteger(Team, 'team');
if (Team < TEAM_RED) or (Team > TEAM_BLUE) then
Team := TEAM_RED;
end;
if (Team < TEAM_RED) or (Team > TEAM_BLUE) then
Team := TEAM_RED;
end;
- for i := 0 to e_MaxJoys-1 do
- e_JoystickDeadzones[i] := config.ReadInt('Joysticks', 'Deadzone' + IntToStr(i), 8192);
+ section := 'Player2';
+ with gPlayer2Settings do
+ begin
+ ReadString(Name, 'name');
+ ReadString(Model, 'model');
+ ReadInteger(Color.R, 'red', 0, 255);
+ ReadInteger(Color.G, 'green', 0, 255);
+ ReadInteger(Color.B, 'blue', 0, 255);
+ ReadInteger(Team, 'team');
+ if (Team < TEAM_RED) or (Team > TEAM_BLUE) then
+ Team := TEAM_RED;
+ end;
- g_GFX_SetMax(Min(config.ReadInt('Game', 'MaxParticles', 1000), 50000));
- g_Shells_SetMax(Min(config.ReadInt('Game', 'MaxShells', 300), 600));
- g_Gibs_SetMax(Min(config.ReadInt('Game', 'MaxGibs', 150), 500));
- g_Corpses_SetMax(Min(config.ReadInt('Game', 'MaxCorpses', 20), 100));
+ section := 'Joysticks';
+ for i := 0 to e_MaxJoys - 1 do
+ begin
+ ReadInteger(e_JoystickDeadzones[i], 'Deadzone' + IntToStr(i))
+ end;
- case config.ReadInt('Game', 'GibsCount', 3) of
+ section := 'Game';
+ ReadInteger(i, 'MaxParticles', 0, 50000); g_GFX_SetMax(i);
+ ReadInteger(i, 'MaxShells', 0, 600); g_Shells_SetMax(i);
+ ReadInteger(i, 'MaxGibs', 0, 500); g_Gibs_SetMax(i);
+ ReadInteger(i, 'MaxCorpses', 0, 100); g_Corpses_SetMax(i);
+ ReadInteger(i, 'GibsCount');
+ case i of
0: gGibsCount := 0;
1: gGibsCount := 8;
2: gGibsCount := 16;
3: gGibsCount := 32;
else gGibsCount := 48;
end;
0: gGibsCount := 0;
1: gGibsCount := 8;
2: gGibsCount := 16;
3: gGibsCount := 32;
else gGibsCount := 48;
end;
+ i := ITEM_RESPAWNTIME div 36; ReadInteger(i, 'ItemRespawnTime', 0); ITEM_RESPAWNTIME := i * 36;
+ ReadInteger(gBloodCount, 'BloodCount', 0, 4);
+ ReadBoolean(gAdvBlood, 'AdvancesBlood');
+ ReadBoolean(gAdvCorpses, 'AdvancesCorpses');
+ ReadBoolean(gAdvGibs, 'AdvancesGibs');
+ ReadInteger(gFlash, 'Flash', 0, 2);
+ ReadBoolean(gDrawBackGround, 'BackGround');
+ ReadBoolean(gShowMessages, 'Messages');
+ ReadBoolean(gRevertPlayers, 'RevertPlayers');
+ ReadInteger(gChatBubble, 'ChatBubble', 0, 4);
+ ReadBoolean(gSFSDebug, 'SFSDebug'); wadoptDebug := gSFSDebug;
+ ReadBoolean(gSFSFastMode, 'SFSFastMode'); wadoptFast := gSFSFastMode;
+ ReadBoolean(e_FastScreenshots, 'FastScreenshots');
+ ReadString(gDefaultMegawadStart, 'DefaultMegawadStart');
+ ReadBoolean(gBerserkAutoswitch, 'BerserkAutoswitching');
+ i := Trunc(g_dbg_scale * 100); ReadInteger(i, 'Scale', 100); g_dbg_scale := i / 100;
+ ReadString(gLanguage, 'Language');
+ if (gLanguage = LANGUAGE_RUSSIAN) or (gLanguage = LANGUAGE_ENGLISH) then
+ gAskLanguage := False
+ else
+ gLanguage := LANGUAGE_ENGLISH;
- ITEM_RESPAWNTIME := 36*Max(config.ReadInt('Game', 'ItemRespawnTime', 60), 0);
- gBloodCount := Min(config.ReadInt('Game', 'BloodCount', 4), 4);
- gAdvBlood := config.ReadBool('Game', 'AdvancesBlood', True);
- gAdvCorpses := config.ReadBool('Game', 'AdvancesCorpses', True);
- gAdvGibs := config.ReadBool('Game', 'AdvancesGibs', True);
- gFlash := Min(Max(config.ReadInt('Game', 'Flash', 1), 0), 2);
- gDrawBackGround := config.ReadBool('Game', 'BackGround', True);
- gShowMessages := config.ReadBool('Game', 'Messages', True);
- gRevertPlayers := config.ReadBool('Game', 'RevertPlayers', False);
- gChatBubble := Min(Max(config.ReadInt('Game', 'ChatBubble', 4), 0), 4);
- gSFSDebug := config.ReadBool('Game', 'SFSDebug', False);
- gSFSFastMode := config.ReadBool('Game', 'SFSFastMode', False);
-
-// Ãåéìïëåé â ñâîåé èãðå
- gcMap := config.ReadStr('GameplayCustom', 'Map', '');
- gcGameMode := config.ReadStr('GameplayCustom', 'GameMode', _lc[I_MENU_GAME_TYPE_DM]);
- gcTimeLimit := Min(Max(config.ReadInt('GameplayCustom', 'TimeLimit', 0), 0), 65535);
- gcGoalLimit := Min(Max(config.ReadInt('GameplayCustom', 'GoalLimit', 0), 0), 65535);
- gcMaxLives := Min(Max(config.ReadInt('GameplayCustom', 'MaxLives', 0), 0), 255);
- gcPlayers := Min(Max(config.ReadInt('GameplayCustom', 'Players', 1), 0), 2);
- gcTeamDamage := config.ReadBool('GameplayCustom', 'TeamDamage', False);
- gcAllowExit := config.ReadBool('GameplayCustom', 'AllowExit', True);
- gcWeaponStay := config.ReadBool('GameplayCustom', 'WeaponStay', False);
- gcMonsters := config.ReadBool('GameplayCustom', 'Monsters', False);
- gcBotsVS := config.ReadStr('GameplayCustom', 'BotsVS', 'Everybody');
+ section := 'GameplayCustom';
+ ReadString(gcMap, 'Map');
+ ReadString(gcGameMode, 'GameMode');
+ ReadInteger(gcTimeLimit, 'TimeLimit', 0, 65535);
+ ReadInteger(gcGoalLimit, 'GoalLimit', 0, 65535);
+ ReadInteger(gcMaxLives, 'MaxLives', 0, 255);
+ ReadInteger(gcPlayers, 'Players', 0, 2);
+ ReadBoolean(gcTeamDamage, 'TeamDamage');
+ ReadBoolean(gcAllowExit, 'AllowExit');
+ ReadBoolean(gcWeaponStay, 'WeaponStay');
+ ReadBoolean(gcMonsters, 'Monsters');
+ ReadString(gcBotsVS, 'BotsVS');
with gGameSettings do
begin
with gGameSettings do
begin
Options := Options or GAME_OPTION_BOTVSMONSTER;
end;
Options := Options or GAME_OPTION_BOTVSMONSTER;
end;
-// Ãåéìïëåé â ñåòåâîé èãðå
- gnMap := config.ReadStr('GameplayNetwork', 'Map', '');
- gnGameMode := config.ReadStr('GameplayNetwork', 'GameMode', _lc[I_MENU_GAME_TYPE_DM]);
- gnTimeLimit := Min(Max(config.ReadInt('GameplayNetwork', 'TimeLimit', 0), 0), 65535);
- gnGoalLimit := Min(Max(config.ReadInt('GameplayNetwork', 'GoalLimit', 0), 0), 65535);
- gnMaxLives := Min(Max(config.ReadInt('GameplayNetwork', 'MaxLives', 0), 0), 255);
- gnPlayers := Min(Max(config.ReadInt('GameplayNetwork', 'Players', 1), 0), 2);
- gnTeamDamage := config.ReadBool('GameplayNetwork', 'TeamDamage', False);
- gnAllowExit := config.ReadBool('GameplayNetwork', 'AllowExit', True);
- gnWeaponStay := config.ReadBool('GameplayNetwork', 'WeaponStay', False);
- gnMonsters := config.ReadBool('GameplayNetwork', 'Monsters', False);
- gnBotsVS := config.ReadStr('GameplayNetwork', 'BotsVS', 'Everybody');
-
-// Îáùèå ñåòåâûå
- NetSlistIP := config.ReadStr('MasterServer', 'IP', 'mpms.doom2d.org');
- NetSlistPort := config.ReadInt('MasterServer', 'Port', 25665);
-
-// Ñåðâåð
- NetServerName := config.ReadStr('Server', 'Name', 'Unnamed Server');
- NetPassword := config.ReadStr('Server', 'Password', '');
- NetPort := Min(Max(0, config.ReadInt('Server', 'Port', 25666)), 65535);
- NetMaxClients := Min(Max(0, config.ReadInt('Server', 'MaxClients', 16)), NET_MAXCLIENTS);
- NetAllowRCON := config.ReadBool('Server', 'RCON', False);
- NetRCONPassword := config.ReadStr('Server', 'RCONPassword', 'default');
- NetUseMaster := config.ReadBool('Server', 'SyncWithMaster', True);
- NetUpdateRate := Max(0, config.ReadInt('Server', 'UpdateInterval', 0));
- NetRelupdRate := Max(0, config.ReadInt('Server', 'ReliableUpdateInterval', 18));
- NetMasterRate := Max(1, config.ReadInt('Server', 'MasterSyncInterval', 60000));
-
-// Êëèåíò
- NetInterpLevel := Max(0, config.ReadInt('Client', 'InterpolationSteps', 2));
- NetForcePlayerUpdate := config.ReadBool('Client', 'ForcePlayerUpdate', False);
- NetPredictSelf := config.ReadBool('Client', 'PredictSelf', True);
- NetClientIP := config.ReadStr('Client', 'LastIP', '127.0.0.1');
- NetClientPort := Max(0, config.ReadInt('Client', 'LastPort', 25666));
-
-// ßçûê:
- str := config.ReadStr('Game', 'Language', '');
- if (str = LANGUAGE_RUSSIAN) or
- (str = LANGUAGE_ENGLISH) then
- begin
- gLanguage := str;
- gAskLanguage := False;
- end
- else
- gLanguage := LANGUAGE_ENGLISH;
+ section := 'GameplayNetwork';
+ ReadString(gnMap, 'Map');
+ ReadString(gnGameMode, 'GameMode');
+ ReadInteger(gnTimeLimit, 'TimeLimit', 0, 65535);
+ ReadInteger(gnGoalLimit, 'GoalLimit', 0, 65535);
+ ReadInteger(gnMaxLives, 'MaxLives', 0, 255);
+ ReadInteger(gnPlayers, 'Players', 0, 2);
+ ReadBoolean(gnTeamDamage, 'TeamDamage');
+ ReadBoolean(gnAllowExit, 'AllowExit');
+ ReadBoolean(gnWeaponStay, 'WeaponStay');
+ ReadBoolean(gnMonsters, 'Monsters');
+ ReadString(gnBotsVS, 'BotsVS');
+
+ section := 'MasterServer';
+ ReadString(NetSlistIP, 'IP');
+ ReadInteger(NetSlistPort, 'Port', 0, 65535);
+ ReadString(NetSlistList, 'List');
+ g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
+
+ section := 'Server';
+ ReadString(NetServerName, 'Name');
+ ReadString(NetPassword, 'Password');
+ ReadInteger(NetPort, 'Port', 0, 65535);
+ ReadInteger(NetMaxClients, 'MaxClients', 0, NET_MAXCLIENTS);
+ ReadBoolean(NetAllowRCON, 'RCON');
+ ReadString(NetRCONPassword, 'RCONPassword');
+ ReadBoolean(NetUseMaster, 'SyncWithMaster');
+ ReadInteger(NetUpdateRate, 'UpdateInterval', 0);
+ ReadInteger(NetRelupdRate, 'ReliableUpdateInterval', 0);
+ ReadInteger(NetMasterRate, 'MasterSyncInterval', 1);
+ ReadBoolean(NetForwardPorts, 'ForwardPorts');
+
+ section := 'Client';
+ ReadInteger(NetInterpLevel, 'InterpolationSteps', 0);
+ ReadBoolean(NetForcePlayerUpdate, 'ForcePlayerUpdate');
+ ReadBoolean(NetPredictSelf, 'PredictSelf');
+ ReadString(NetClientIP, 'LastIP');
+ ReadInteger(NetClientPort, 'LastPort', 0, 65535);
config.Free();
config.Free();
- if gTextureFilter then
- TEXTUREFILTER := GL_LINEAR
- else
- TEXTUREFILTER := GL_NEAREST;
+ //if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST;
end;
procedure g_Options_Write(FileName: String);
end;
procedure g_Options_Write(FileName: String);
config: TConfig;
i: Integer;
begin
config: TConfig;
i: Integer;
begin
- e_WriteLog('Writing config', MSG_NOTIFY);
+ e_WriteLog('Writing config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config := TConfig.CreateFile(FileName);
config.WriteInt('Video', 'BPP', gBPP);
config.WriteBool('Video', 'VSync', gVSync);
config.WriteBool('Video', 'TextureFilter', gTextureFilter);
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.WriteBool('Sound', 'NoSound', gNoSound);
config.WriteInt('Sound', 'SoundLevel', gSoundLevel);
config.WriteBool('Sound', 'MuteInactive', gMuteWhenInactive);
config.WriteInt('Sound', 'Announcer', gAnnouncer);
config.WriteBool('Sound', 'SoundEffectsDF', gSoundEffectsDF);
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);
config.WriteInt('Sound', 'SDLSampleRate', gsSDLSampleRate);
config.WriteInt('Sound', 'SDLBufferSize', gsSDLBufferSize);
- with config, gGameControls.GameControls do
+ with config, gPlayer1Settings do
begin
begin
- WriteInt('GameControls', 'TakeScreenshot', TakeScreenshot);
- WriteInt('GameControls', 'Stat', Stat);
- WriteInt('GameControls', 'Chat', Chat);
- WriteInt('GameControls', 'TeamChat', TeamChat);
- end;
-
- with config, gGameControls.P1Control, gPlayer1Settings do
- begin
- WriteInt('Player1', 'KeyRight', KeyRight);
- WriteInt('Player1', 'KeyLeft', KeyLeft);
- WriteInt('Player1', 'KeyUp', KeyUp);
- WriteInt('Player1', 'KeyDown', KeyDown);
- WriteInt('Player1', 'KeyFire', KeyFire);
- WriteInt('Player1', 'KeyJump', KeyJump);
- WriteInt('Player1', 'KeyNextWeapon', KeyNextWeapon);
- WriteInt('Player1', 'KeyPrevWeapon', KeyPrevWeapon);
- WriteInt('Player1', 'KeyOpen', KeyOpen);
-
WriteStr('Player1', 'Name', Name);
WriteStr('Player1', 'model', Model);
WriteInt('Player1', 'red', Color.R);
WriteStr('Player1', 'Name', Name);
WriteStr('Player1', 'model', Model);
WriteInt('Player1', 'red', Color.R);
WriteInt('Player1', 'team', Team);
end;
WriteInt('Player1', 'team', Team);
end;
- with config, gGameControls.P2Control, gPlayer2Settings do
+ with config, gPlayer2Settings do
begin
begin
- WriteInt('Player2', 'KeyRight', KeyRight);
- WriteInt('Player2', 'KeyLeft', KeyLeft);
- WriteInt('Player2', 'KeyUp', KeyUp);
- WriteInt('Player2', 'KeyDown', KeyDown);
- WriteInt('Player2', 'KeyFire', KeyFire);
- WriteInt('Player2', 'KeyJump', KeyJump);
- WriteInt('Player2', 'KeyNextWeapon', KeyNextWeapon);
- WriteInt('Player2', 'KeyPrevWeapon', KeyPrevWeapon);
- WriteInt('Player2', 'KeyOpen', KeyOpen);
-
WriteStr('Player2', 'Name', Name);
WriteStr('Player2', 'model', Model);
WriteInt('Player2', 'red', Color.R);
WriteStr('Player2', 'Name', Name);
WriteStr('Player2', 'model', Model);
WriteInt('Player2', 'red', Color.R);
config.WriteInt('Game', 'ChatBubble', gChatBubble);
config.WriteBool('Game', 'SFSDebug', gSFSDebug);
config.WriteBool('Game', 'SFSFastMode', gSFSFastMode);
config.WriteInt('Game', 'ChatBubble', gChatBubble);
config.WriteBool('Game', 'SFSDebug', gSFSDebug);
config.WriteBool('Game', 'SFSFastMode', gSFSFastMode);
+ config.WriteBool('Game', 'FastScreenshots', e_FastScreenshots);
+ config.WriteStr('Game', 'DefaultMegawadStart', gDefaultMegawadStart);
+ config.WriteBool('Game', 'BerserkAutoswitching', gBerserkAutoswitch);
+ config.WriteInt('Game', 'Scale', Round(g_dbg_scale * 100));
config.WriteStr ('GameplayCustom', 'Map', gcMap);
config.WriteStr ('GameplayCustom', 'GameMode', gcGameMode);
config.WriteStr ('GameplayCustom', 'Map', gcMap);
config.WriteStr ('GameplayCustom', 'GameMode', gcGameMode);
config.WriteStr('MasterServer', 'IP', NetSlistIP);
config.WriteInt('MasterServer', 'Port', NetSlistPort);
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);
config.WriteStr ('Server', 'Name', NetServerName);
config.WriteStr ('Server', 'Password', NetPassword);
config.WriteBool('Server', 'RCON', NetAllowRCON);
config.WriteStr ('Server', 'RCONPassword', NetRCONPassword);
config.WriteBool('Server', 'SyncWithMaster', NetUseMaster);
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);
config.WriteInt ('Server', 'UpdateInterval', NetUpdateRate);
config.WriteInt ('Server', 'ReliableUpdateInterval', NetRelupdRate);
config.WriteInt ('Server', 'MasterSyncInterval', NetMasterRate);
var
config: TConfig;
begin
var
config: TConfig;
begin
- e_WriteLog('Writing language config', MSG_NOTIFY);
+ e_WriteLog('Writing language config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config.WriteStr('Game', 'Language', gLanguage);
config := TConfig.CreateFile(FileName);
config.WriteStr('Game', 'Language', gLanguage);
config: TConfig;
sW, sH: Integer;
begin
config: TConfig;
sW, sH: Integer;
begin
- e_WriteLog('Writing resolution to config', MSG_NOTIFY);
+ e_WriteLog('Writing resolution to config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config := TConfig.CreateFile(FileName);
sW := gScreenWidth;
sH := gScreenHeight;
end;
sW := gScreenWidth;
sH := gScreenHeight;
end;
+ e_LogWritefln(' (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]);
config.WriteInt('Video', 'ScreenWidth', sW);
config.WriteInt('Video', 'ScreenHeight', sH);
config.WriteInt('Video', 'ScreenWidth', sW);
config.WriteInt('Video', 'ScreenHeight', sH);
config.WriteBool('Video', 'Fullscreen', gFullscreen);
config.WriteBool('Video', 'Maximized', gWinMaximized);
config.WriteBool('Video', 'Fullscreen', gFullscreen);
config.WriteBool('Video', 'Maximized', gWinMaximized);
+ config.WriteStr('Player1', 'Name', gPlayer1Settings.Name);
+ config.WriteStr('Player2', 'Name', gPlayer2Settings.Name);
+
config.SaveFile(FileName);
config.Free();
end;
config.SaveFile(FileName);
config.Free();
end;
var
config: TConfig;
begin
var
config: TConfig;
begin
- e_WriteLog('Writing custom gameplay config', MSG_NOTIFY);
+ e_WriteLog('Writing custom gameplay config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config := TConfig.CreateFile(FileName);
var
config: TConfig;
begin
var
config: TConfig;
begin
- e_WriteLog('Writing network gameplay config', MSG_NOTIFY);
+ e_WriteLog('Writing network gameplay config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config := TConfig.CreateFile(FileName);
var
config: TConfig;
begin
var
config: TConfig;
begin
- e_WriteLog('Writing server config', MSG_NOTIFY);
+ e_WriteLog('Writing server config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config := TConfig.CreateFile(FileName);
config.WriteInt ('Server', 'Port', NetPort);
config.WriteInt ('Server', 'MaxClients', NetMaxClients);
config.WriteBool('Server', 'SyncWithMaster', NetUseMaster);
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();
config.SaveFile(FileName);
config.Free();
var
config: TConfig;
begin
var
config: TConfig;
begin
- e_WriteLog('Writing client config', MSG_NOTIFY);
+ e_WriteLog('Writing client config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
config := TConfig.CreateFile(FileName);
config.Free();
end;
config.Free();
end;
+initialization
+ Randomize;
+ machine := Random(10000)
end.
end.