diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index fa88259bb75bd1c6a763e5afd59686293ca16368..078ced29cfaaf9b0a86ac020981b3366f62c5bba 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
*
* 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, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
interface
uses
- g_language, g_weapons;
+ g_language, g_weapons, utils;
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_Write_Video(FileName: String);
procedure g_Options_Write_Gameplay_Custom(FileName: String);
procedure g_Options_Write_Gameplay_Net(FileName: String);
procedure g_Options_Write_Net_Server(FileName: String);
procedure g_Options_Write_Net_Client(FileName: String);
+procedure g_Options_Commands (p: SSArray);
const DF_Default_Megawad_Start = 'megawads/DOOM2D.WAD:\MAP01';
var
-// gGameControls: TControls;
gScreenWidth: Word;
gScreenHeight: Word;
- gWinRealPosX: Integer;
- gWinRealPosY: Integer;
- gBPP: Byte;
+ gBPP: Integer;
gFreq: Byte;
gFullscreen: Boolean;
gWinMaximized: Boolean;
glLegacyNPOT: Boolean;
gTextureFilter: Boolean;
gNoSound: Boolean;
- gSoundLevel: Byte;
- gMusicLevel: Byte;
- gMaxSimSounds: Byte;
+ gSoundLevel: Integer;
+ gMusicLevel: Integer;
+ gMaxSimSounds: Integer;
gMuteWhenInactive: Boolean;
gAdvCorpses: Boolean;
gAdvBlood: Boolean;
gAdvGibs: Boolean;
gGibsCount: Integer;
- gBloodCount: Byte;
- gFlash: Byte;
+ gBloodCount: Integer;
+ gFlash: Integer;
gDrawBackGround: Boolean;
gShowMessages: Boolean;
gRevertPlayers: Boolean;
gnBotsVS: String;
gsSDLSampleRate: Integer;
gsSDLBufferSize: Integer;
- gSFSDebug: Boolean;
- gSFSFastMode: Boolean;
gDefaultMegawadStart: AnsiString;
gBerserkAutoswitch: Boolean;
+ glNPOTOverride: Boolean = false;
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,
- g_items, wadreader, e_graphics, g_touch, SDL2, envvars;
+ g_items, wadreader, e_graphics, g_touch, envvars, g_system;
var
machine: Integer;
Result := Copy(Result, 1, 10) + ' ' + IntToStr(n)
end;
+{$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 *)
- SDL_GetDesktopDisplayMode(0, @display);
- {$IF DEFINED(ANDROID)}
+ 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;
- //gBPP := SDL_BITSPERPIXEL(dispaly.format);
- gBPP := 32;
- gFullScreen := True; (* rotation not allowed? *)
{$ELSE}
(* Window must be smaller than display *)
closest.w := display.w;
gScreenWidth := closest.w;
gScreenHeight := closest.h;
//gBPP := SDL_BITSPERPIXEL(closest.format); (* Resolution list didn't work for some reason *)
- gBPP := 32;
- gFullScreen := False;
{$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;
+ gRC_Width := gScreenWidth;
+ gRC_Height := gScreenHeight;
+ gRC_FullScreen := gFullScreen;
+ 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;
+ gWinMaximized := False;
+ gVSync := True;
+ gTextureFilter := True;
+ glLegacyNPOT := False;
+ gRC_Width := gScreenWidth;
+ gRC_Height := gScreenHeight;
+ gRC_FullScreen := gFullScreen;
e_LogWriteLn('g_Options_SetDefaultVideo: w = ' + IntToStr(gScreenWidth) + ' h = ' + IntToStr(gScreenHeight));
- g_Console_ResetBinds
+ g_Console_ResetBinds;
end;
+{$ENDIF}
procedure g_Options_SetDefault();
var
gShowMessages := True;
gRevertPlayers := False;
gChatBubble := 4;
- gPlayerIndicator := True;
- gSFSDebug := False;
- gSFSFastMode := False;
+ wadoptDebug := False;
+ wadoptFast := False;
e_FastScreenshots := True;
gDefaultMegawadStart := DF_Default_Megawad_Start;
gBerserkAutoswitch := True;
(* 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';
procedure g_Options_Read(FileName: String);
var
- i: Integer;
config: TConfig;
section: String;
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(glLegacyNPOT, 'LegacyCompatible');
-
- 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
Team := TEAM_RED;
end;
- section := 'Joysticks';
- for i := 0 to e_MaxJoys - 1 do
- begin
- ReadInteger(e_JoystickDeadzones[i], 'Deadzone' + IntToStr(i))
- end;
-
- 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;
- 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(gPlayerIndicator, 'PlayerIndicator');
- 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;
-
section := 'GameplayCustom';
ReadString(gcMap, 'Map');
ReadString(gcGameMode, 'GameMode');
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');
end;
procedure g_Options_Write(FileName: String);
-var
- config: TConfig;
- i: Integer;
+ var config: TConfig;
begin
e_WriteLog('Writing config', TMsgType.Notify);
config := TConfig.CreateFile(FileName);
- config.WriteInt('Video', 'ScreenWidth', gScreenWidth);
- config.WriteInt('Video', 'ScreenHeight', gScreenHeight);
- config.WriteInt('Video', 'WinPosX', gWinRealPosX);
- config.WriteInt('Video', 'WinPosY', gWinRealPosY);
- config.WriteBool('Video', 'Fullscreen', gFullScreen);
- config.WriteBool('Video', 'Maximized', gWinMaximized);
- config.WriteInt('Video', 'BPP', gBPP);
- config.WriteBool('Video', 'VSync', gVSync);
- config.WriteBool('Video', 'TextureFilter', gTextureFilter);
- config.WriteBool('Video', 'LegacyCompatible', glLegacyNPOT);
-
- config.WriteBool('Sound', 'NoSound', gNoSound);
- config.WriteInt('Sound', 'SoundLevel', gSoundLevel);
- config.WriteInt('Sound', 'MusicLevel', gMusicLevel);
- config.WriteInt('Sound', 'MaxSimSounds', gMaxSimSounds);
- 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);
-
with config, gPlayer1Settings do
begin
WriteStr('Player1', 'Name', Name);
WriteInt('Player2', 'team', Team);
end;
- for i := 0 to e_MaxJoys-1 do
- config.WriteInt('Joysticks', 'Deadzone' + IntToStr(i), e_JoystickDeadzones[i]);
-
- with config do
- case gGibsCount of
- 0: config.WriteInt('Game', 'GibsCount', 0);
- 8: config.WriteInt('Game', 'GibsCount', 1);
- 16: config.WriteInt('Game', 'GibsCount', 2);
- 32: config.WriteInt('Game', 'GibsCount', 3);
- else config.WriteInt('Game', 'GibsCount', 4);
- end;
-
- config.WriteInt('Game', 'ItemRespawnTime', ITEM_RESPAWNTIME div 36);
- config.WriteInt('Game', 'MaxParticles', g_GFX_GetMax());
- config.WriteInt('Game', 'MaxShells', g_Shells_GetMax());
- config.WriteInt('Game', 'MaxGibs', g_Gibs_GetMax());
- config.WriteInt('Game', 'MaxCorpses', g_Corpses_GetMax());
- config.WriteInt('Game', 'BloodCount', gBloodCount);
- config.WriteBool('Game', 'AdvancesBlood', gAdvBlood);
- config.WriteBool('Game', 'AdvancesCorpses', gAdvCorpses);
- config.WriteBool('Game', 'AdvancesGibs', gAdvGibs);
- config.WriteInt('Game', 'Flash', gFlash);
- config.WriteBool('Game', 'BackGround', gDrawBackGround);
- config.WriteBool('Game', 'Messages', gShowMessages);
- config.WriteBool('Game', 'RevertPlayers', gRevertPlayers);
- config.WriteInt('Game', 'ChatBubble', gChatBubble);
- config.WriteBool('Game', 'PlayerIndicator', gPlayerIndicator);
- 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.WriteInt ('GameplayCustom', 'TimeLimit', gcTimeLimit);
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.Free();
end;
-procedure g_Options_Write_Language(FileName: String);
-var
- config: TConfig;
-begin
- e_WriteLog('Writing language config', TMsgType.Notify);
-
- config := TConfig.CreateFile(FileName);
- config.WriteStr('Game', 'Language', gLanguage);
- config.SaveFile(FileName);
- config.Free();
-end;
-
-procedure g_Options_Write_Video(FileName: String);
-var
- config: TConfig;
- sW, sH: Integer;
-begin
- e_WriteLog('Writing resolution to config', TMsgType.Notify);
-
- config := TConfig.CreateFile(FileName);
-
- if gWinMaximized and (not gFullscreen) then
- begin
- sW := gWinSizeX;
- sH := gWinSizeY;
- end
- else
- begin
- 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', 'WinPosX', gWinRealPosX);
- config.WriteInt('Video', 'WinPosY', gWinRealPosY);
- 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;
-
procedure g_Options_Write_Gameplay_Custom(FileName: String);
var
config: TConfig;
config.Free();
end;
+procedure g_Options_Commands (p: SSArray);
+ var cmd: AnsiString; i: Integer;
+begin
+ cmd := LowerCase(p[0]);
+ case cmd of
+ 'r_reset':
+ begin
+ sys_EnableVSync(gVSync);
+ gRC_Width := Max(1, gRC_Width);
+ gRC_Height := Max(1, gRC_Height);
+ gBPP := Max(1, gBPP);
+ if sys_SetDisplayMode(gRC_Width, gRC_Height, gBPP, gRC_FullScreen) = True then
+ e_LogWriteln('resolution changed')
+ else
+ e_LogWriteln('resolution not changed')
+ end;
+ 'g_language':
+ begin
+ if Length(p) = 2 then
+ begin
+ gAskLanguage := true;
+ gLanguage := LANGUAGE_ENGLISH;
+ case LowerCase(p[1]) of
+ 'english':
+ begin
+ gAskLanguage := false;
+ gLanguage := LANGUAGE_ENGLISH;
+ end;
+ 'russian':
+ begin
+ gAskLanguage := false;
+ gLanguage := LANGUAGE_RUSSIAN;
+ end;
+ 'ask':
+ begin
+ gAskLanguage := true;
+ gLanguage := LANGUAGE_ENGLISH;
+ end;
+ end;
+ g_Language_Set(gLanguage)
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <English|Russian|Ask>', [cmd])
+ end
+ end;
+ 'g_max_particles':
+ begin
+ if Length(p) = 2 then
+ begin
+ i := Max(0, StrToInt(p[1]));
+ g_GFX_SetMax(i)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_GFX_GetMax()])
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <n>', [cmd])
+ end
+ end;
+ 'g_max_shells':
+ begin
+ if Length(p) = 2 then
+ begin
+ i := Max(0, StrToInt(p[1]));
+ g_Shells_SetMax(i)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_Shells_GetMax()])
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <n>', [cmd])
+ end
+ end;
+ 'g_max_gibs':
+ begin
+ if Length(p) = 2 then
+ begin
+ i := Max(0, StrToInt(p[1]));
+ g_Gibs_SetMax(i)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_Gibs_GetMax()])
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <n>', [cmd])
+ end
+ end;
+ 'g_max_corpses':
+ begin
+ if Length(p) = 2 then
+ begin
+ i := Max(0, StrToInt(p[1]));
+ g_Corpses_SetMax(i)
+ end
+ else if Length(p) = 1 then
+ begin
+ e_LogWritefln('%s', [g_Corpses_GetMax()])
+ end
+ else
+ begin
+ e_LogWritefln('usage: %s <n>', [cmd])
+ end
+ end;
+ 'g_item_respawn_time':
+ begin
+ if Length(p) = 2 then
+ ITEM_RESPAWNTIME := Max(0, StrToInt(p[1])) * 36
+ else if Length(p) = 1 then
+ e_LogWritefln('%s', [ITEM_RESPAWNTIME div 36])
+ else
+ e_LogWritefln('usage: %s <n>', [cmd])
+ end;
+ end;
+end;
+
initialization
Randomize;
- machine := Random(10000)
+ machine := Random(10000);
+
+ (* Video *)
+ conRegVar('r_width', @gRC_Width, '', '');
+ conRegVar('r_height', @gRC_Height, '', '');
+ conRegVar('r_fullscreen', @gRC_FullScreen, '', '');
+ conRegVar('r_maximized', @gRC_Maximized, '', '');
+ conRegVar('r_bpp', @gBPP, '', '');
+ conRegVar('r_vsync', @gVSync, '', '');
+ conRegVar('r_texfilter', @gTextureFilter, '', '');
+ conRegVar('r_npot', @glNPOTOverride, '', '');
+
+ (* Sound *)
+ conRegVar('s_nosound', @gNoSound, '', '');
+ conRegVar('s_soundvolume', @gSoundLevel, '', '');
+ conRegVar('s_musicvolume', @gMusicLevel, '', '');
+ conRegVar('s_maxsim', @gMaxSimSounds, '', ''); // e_sound_fmod/sdl?
+ conRegVar('s_muteinactive', @gMuteWhenInactive, '', '');
+ conRegVar('s_announcer', @gAnnouncer, '', '');
+ conRegVar('s_sfx', @gSoundEffectsDF, '', '');
+ conRegVar('s_chatsounds', @gUseChatSounds, '', '');
+ {$IFDEF USE_SDLMIXER}
+ conRegVar('sdl_mixer_samplerate', @gsSDLSampleRate, '', '');
+ conRegVar('sdl_mixer_buffersize', @gsSDLBufferSize, '', '');
+ {$ENDIF}
+
+ (* Game *)
+ conRegVar('g_gibs_count', @gGibsCount, '', '');
+ conRegVar('g_blood_count', @gBloodCount, '', '');
+ conRegVar('g_adv_blood', @gAdvBlood, '', '');
+ conRegVar('g_adv_corpses', @gAdvCorpses, '', '');
+ conRegVar('g_adv_gibs', @gAdvGibs, '', '');
+ conRegVar('r_flash', @gFlash, '', '');
+ conRegVar('r_background', @gDrawBackGround, '', '');
+ conRegVar('g_show_messages', @gShowMessages, '', '');
+ conRegVar('r_revert_players', @gRevertPlayers, '', '');
+ conRegVar('r_chat_bubble', @gChatBubble, '', '');
+ conRegVar('sfs_debug', @wadoptDebug, '', '');
+ conRegVar('sfs_fastmode', @wadoptFast, '', '');
+ conRegVar('g_fast_screenshots', @e_FastScreenshots, '', '');
+ conRegVar('g_default_megawad', @gDefaultMegawadStart, '', '');
+
end.