diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 574a28beeaae652ca11f4076aa674d2de57585c4..645002e2b9bba699ec47478817384432b43d3bb4 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
+{$MODE DELPHI}
unit g_options;
interface
gFullscreen: Boolean = False;
gWinMaximized: Boolean = False;
gVSync: Boolean = False;
+ glLegacyNPOT: Boolean = False;
gTextureFilter: Boolean = True;
gNoSound: Boolean = False;
gSoundLevel: Byte = 75;
gnWeaponStay: Boolean = False;
gnMonsters: Boolean = False;
gnBotsVS: String = 'Everybody';
+ gsSDLSampleRate: Integer = 44100;
+ gsSDLBufferSize: Integer = 2048;
+ gSFSDebug: Boolean = False;
+ gSFSFastMode: Boolean = False;
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;
+ g_items, GL, GLExt, wadreader, e_graphics;
procedure g_Options_SetDefault();
var
gDrawBackGround := True;
gShowMessages := True;
gRevertPlayers := False;
-
+
for i := 0 to e_MaxJoys-1 do
e_JoystickDeadzones[i] := 8192;
gBPP := 32;
gVSync := False;
gTextureFilter := True;
- fUseMipmaps := False;
+ glLegacyNPOT := False;
Exit;
end;
gFreq := config.ReadInt('Video', 'Freq', 0);
gVSync := config.ReadBool('Video', 'VSync', True);
gTextureFilter := config.ReadBool('Video', 'TextureFilter', True);
- fUseMipmaps := config.ReadBool('Video', 'LegacyCompatible', False);
+ glLegacyNPOT := config.ReadBool('Video', 'LegacyCompatible', False);
gNoSound := config.ReadBool('Sound', 'NoSound', False);
gSoundLevel := Min(config.ReadInt('Sound', 'SoundLevel', 75), 255);
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
begin
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);
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);
+ wadoptDebug := gSFSDebug;
+ gSFSFastMode := config.ReadBool('Game', 'SFSFastMode', False);
+ wadoptFast := gSFSFastMode;
+ e_FastScreenshots := config.ReadBool('Game', 'FastScreenshots', True);
// Ãåéìïëåé â ñâîåé èãðå
gcMap := config.ReadStr('GameplayCustom', 'Map', '');
config.WriteInt('Video', 'BPP', gBPP);
config.WriteBool('Video', 'VSync', gVSync);
config.WriteBool('Video', 'TextureFilter', gTextureFilter);
- config.WriteBool('Video', 'LegacyCompatible', fUseMipmaps);
+ config.WriteBool('Video', 'LegacyCompatible', glLegacyNPOT);
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.WriteInt('Sound', 'SDLSampleRate', gsSDLSampleRate);
+ config.WriteInt('Sound', 'SDLBufferSize', gsSDLBufferSize);
with config, gGameControls.GameControls do
begin
WriteInt('Player2', 'blue', Color.B);
WriteInt('Player2', 'team', Team);
end;
-
+
for i := 0 to e_MaxJoys-1 do
config.WriteInt('Joysticks', 'Deadzone' + IntToStr(i), e_JoystickDeadzones[i]);
config.WriteBool('Game', 'Messages', gShowMessages);
config.WriteBool('Game', 'RevertPlayers', gRevertPlayers);
config.WriteInt('Game', 'ChatBubble', gChatBubble);
+ config.WriteBool('Game', 'SFSDebug', gSFSDebug);
+ config.WriteBool('Game', 'SFSFastMode', gSFSFastMode);
+ config.WriteBool('Game', 'FastScreenshots', e_FastScreenshots);
config.WriteStr ('GameplayCustom', 'Map', gcMap);
config.WriteStr ('GameplayCustom', 'GameMode', gcGameMode);