diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 3d67ec0bdc9a953a28fc792e03c950eea7315328..a1397a80e949d2b70bfb89ad91b13b4c4db316b6 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
implementation
uses
+{$IFDEF USE_NANOGL}
+ nanoGL,
+{$ELSE}
+ GL, GLExt,
+{$ENDIF}
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_texture,
- g_items, GL, GLExt, wadreader, e_graphics;
+ g_items, wadreader, e_graphics;
procedure g_Options_SetDefault();
var
gDrawBackGround := True;
gShowMessages := True;
gRevertPlayers := False;
+ g_dbg_scale := 1.0;
for i := 0 to e_MaxJoys-1 do
e_JoystickDeadzones[i] := 8192;
KeyPrevWeapon := 71;
KeyOpen := 54;
KeyStrafe := 0;
- for i := 0 to High(KeyWeapon) do
+ for i := 0 to 9 do
+ KeyWeapon[i] := 30 + i;
+ KeyWeapon[10] := 45;
+ for i := 10 to High(KeyWeapon) do
KeyWeapon[i] := 0;
- KeyRight2 := 0;
- KeyLeft2 := 0;
- KeyUp2 := 0;
- KeyDown2 := 0;
- KeyFire2 := 0;
- KeyJump2 := 0;
- KeyNextWeapon2 := 0;
- KeyPrevWeapon2 := 0;
- KeyOpen2 := 0;
- KeyStrafe2 := 0;
+ KeyRight2 := VK_RIGHT;
+ KeyLeft2 := VK_LEFT;
+ KeyUp2 := VK_UP;
+ KeyDown2 := VK_DOWN;
+ KeyFire2 := VK_FIRE;
+ KeyJump2 := VK_JUMP;
+ KeyNextWeapon2 := VK_NEXT;
+ KeyPrevWeapon2 := VK_PREV;
+ KeyOpen2 := VK_OPEN;
+ KeyStrafe2 := VK_STRAFE;
for i := 0 to High(KeyWeapon2) do
- KeyWeapon2[i] := 0;
+ KeyWeapon2[i] := VK_0 + i;
end;
with gGameControls.P2Control do
e_FastScreenshots := config.ReadBool('Game', 'FastScreenshots', True);
gDefaultMegawadStart := config.ReadStr('Game', 'DefaultMegawadStart', DF_Default_Megawad_Start);
gBerserkAutoswitch := config.ReadBool('Game', 'BerserkAutoswitching', True);
+ g_dbg_scale := Max(config.ReadInt('Game', 'Scale', 1), 1);
// Ãåéìïëåé â ñâîåé èãðå
gcMap := config.ReadStr('GameplayCustom', 'Map', '');
config.WriteBool('Game', 'FastScreenshots', e_FastScreenshots);
config.WriteStr('Game', 'DefaultMegawadStart', gDefaultMegawadStart);
config.WriteBool('Game', 'BerserkAutoswitching', gBerserkAutoswitch);
+ config.WriteInt('Game', 'Scale', Round(g_dbg_scale));
config.WriteStr ('GameplayCustom', 'Map', gcMap);
config.WriteStr ('GameplayCustom', 'GameMode', gcGameMode);