X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=64b08642029b320c93a0377ae8a56526b94eb821;hp=7caa3ba142386b5eac3b72d0a977f6d529218cc3;hb=51998d817120cd3833df7bae3d355642fd4abde5;hpb=0e101bd452c40da601236aaa2dd4106be47ddce1

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 7caa3ba..64b0864 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -30,13 +30,12 @@ uses
     ACTION_SCORES = 6;
     ACTION_ACTIVATE = 7;
     ACTION_STRAFE = 8;
-    ACTION_WEAPNEXT = 9;
-    ACTION_WEAPPREV = 10;
 
     FIRST_ACTION = ACTION_JUMP;
-    LAST_ACTION = ACTION_WEAPPREV;
+    LAST_ACTION = ACTION_STRAFE;
 
 procedure g_Console_Init;
+procedure g_Console_SysInit;
 procedure g_Console_Update;
 procedure g_Console_Draw (MessagesOnly: Boolean = False);
 procedure g_Console_Char (C: AnsiChar);
@@ -53,8 +52,9 @@ function  g_Console_Interactive: Boolean;
 function  g_Console_Action (action: Integer): Boolean;
 function  g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean;
 function  g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer;
-procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False);
 procedure g_Console_ProcessBind (key: Integer; down: Boolean);
+procedure g_Console_ProcessBindRepeat (key: Integer);
 procedure g_Console_ResetBinds;
 
 procedure conwriteln (const s: AnsiString; show: Boolean=false);
@@ -63,6 +63,8 @@ procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean=
 procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 
 // <0: no arg; 0/1: true/false
@@ -71,6 +73,12 @@ function conGetBoolArg (p: SSArray; idx: Integer): Integer;
 // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
 function conParseFloat (var res: Single; const s: AnsiString): Boolean;
 
+const
+  {$IFDEF HEADLESS}
+    defaultConfigScript = 'dfserver.cfg';
+  {$ELSE}
+    defaultConfigScript = 'dfconfig.cfg';
+  {$ENDIF}
 
 var
   gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
@@ -80,14 +88,18 @@ var
   gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
   gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
   gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+  gConfigScript: string = defaultConfigScript;
 
 implementation
 
 uses
-  g_textures, g_main, e_graphics, e_input, g_game,
-  SysUtils, g_basic, g_options, Math, g_touch,
-  g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf;
+  g_textures, g_main, e_graphics, e_input, g_game, g_gfx, g_player, g_items,
+  SysUtils, g_basic, g_options, Math, g_touch, e_res,
+  g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons;
 
+const
+  autoexecScript = 'autoexec.cfg';
+  configComment = 'generated by doom2d, do not modify';
 
 type
   PCommand = ^TCommand;
@@ -143,6 +155,7 @@ var
                             end;
 
   gInputBinds: Array [0..e_MaxInputKeys - 1] of record
+    rep: Boolean;
     down, up: SSArray;
   end;
   menu_toggled: BOOLEAN; (* hack for menu controls *)
@@ -282,6 +295,50 @@ begin
 end;
 
 
+procedure wordVarHandler (me: PCommand; p: SSArray);
+var
+  old: Integer;
+begin
+  if (Length(p) <> 2) then
+  begin
+    conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+  end
+  else
+  begin
+    try
+      old := PWord(me.ptr)^;
+      PWord(me.ptr)^ := min($FFFF, StrToDWord(p[1]));
+      if PWord(me.ptr)^ <> old then
+        g_Console_WriteGameConfig();
+    except
+      conwritefln('invalid word value: "%s"', [p[1]]);
+    end;
+  end;
+end;
+
+
+procedure dwordVarHandler (me: PCommand; p: SSArray);
+var
+  old: Integer;
+begin
+  if (Length(p) <> 2) then
+  begin
+    conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]);
+  end
+  else
+  begin
+    try
+      old := PCardinal(me.ptr)^;
+      PCardinal(me.ptr)^ := StrToDWord(p[1]);
+      if PCardinal(me.ptr)^ <> old then
+        g_Console_WriteGameConfig();
+    except
+      conwritefln('invalid dword value: "%s"', [p[1]]);
+    end;
+  end;
+end;
+
+
 procedure strVarHandler (me: PCommand; p: SSArray);
 var
   old: AnsiString;
@@ -342,6 +399,48 @@ begin
 end;
 
 
+procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+  f: Integer;
+  cp: PCommand;
+begin
+  f := Length(commands);
+  SetLength(commands, f+1);
+  cp := @commands[f];
+  cp.cmd := LowerCase(conname);
+  cp.proc := nil;
+  cp.procEx := wordVarHandler;
+  cp.help := ahelp;
+  cp.hidden := ahidden;
+  cp.ptr := pvar;
+  cp.msg := amsg;
+  cp.cheat := acheat;
+  cp.action := -1;
+  cp.player := -1;
+end;
+
+
+procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
+var
+  f: Integer;
+  cp: PCommand;
+begin
+  f := Length(commands);
+  SetLength(commands, f+1);
+  cp := @commands[f];
+  cp.cmd := LowerCase(conname);
+  cp.proc := nil;
+  cp.procEx := dwordVarHandler;
+  cp.help := ahelp;
+  cp.hidden := ahidden;
+  cp.ptr := pvar;
+  cp.msg := amsg;
+  cp.cheat := acheat;
+  cp.action := -1;
+  cp.player := -1;
+end;
+
+
 procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload;
 var
   f: Integer;
@@ -579,7 +678,7 @@ begin
   begin
     // exec <filename>
     if Length(p) = 2 then
-      g_Console_ReadConfig(GameDir + '/' + p[1])
+      g_Console_ReadConfig(p[1])
     else
       g_Console_Add('exec <script file>');
   end;
@@ -588,9 +687,14 @@ begin
   begin
     // writeconfig <filename>
     if Length(p) = 2 then
-      g_Console_WriteConfig(GameDir + '/' + p[1])
+    begin
+      s := e_GetWriteableDir(ConfigDirs);
+      g_Console_WriteConfig(e_CatPath(s, p[1]))
+    end
     else
-      g_Console_Add('writeconfig <file>');
+    begin
+      g_Console_Add('writeconfig <file>')
+    end
   end;
 
   if (cmd = 'ver') or (cmd = 'version') then
@@ -730,6 +834,34 @@ begin
     begin
       g_Console_Add('bind <key> <down action> [up action]')
     end;
+  'bindrep':
+    // bindrep <key>
+    if Length(p) = 2 then
+    begin
+      key := LowerCase(p[1]);
+      i := 0;
+      while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
+      if i < e_MaxInputKeys then
+        gInputBinds[i].rep := True
+      else
+        g_Console_Add('bindrep: "' + p[1] + '" is not a key')
+    end
+    else
+      g_Console_Add('bindrep <key>');
+  'bindunrep':
+    // bindunrep <key>
+    if Length(p) = 2 then
+    begin
+      key := LowerCase(p[1]);
+      i := 0;
+      while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i);
+      if i < e_MaxInputKeys then
+        gInputBinds[i].rep := False
+      else
+        g_Console_Add('bindunrep: "' + p[1] + '" is not a key')
+    end
+    else
+      g_Console_Add('bindunrep <key>');
   'bindlist':
     for i := 0 to e_MaxInputKeys - 1 do
       if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then
@@ -831,11 +963,9 @@ begin
   end
 end;
 
-procedure g_Console_Init();
-  var
-    a: Integer;
+procedure g_Console_SysInit;
+  var a: Integer;
 begin
-  g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
   Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
   gConsoleShow := False;
   gChatShow := False;
@@ -852,7 +982,15 @@ begin
 
   AddCommand('segfault', segfault, 'make segfault');
 
+  AddCommand('quit', SystemCommands);
+  AddCommand('exit', SystemCommands);
+  AddCommand('r_reset', SystemCommands);
+  AddCommand('r_maxfps', SystemCommands);
+  AddCommand('g_language', SystemCommands);
+
   AddCommand('bind', BindCommands);
+  AddCommand('bindrep', BindCommands);
+  AddCommand('bindunrep', BindCommands);
   AddCommand('bindlist', BindCommands);
   AddCommand('unbind', BindCommands);
   AddCommand('unbindall', BindCommands);
@@ -890,38 +1028,77 @@ begin
   AddCommand('d_joy', DebugCommands);
   AddCommand('d_mem', DebugCommands);
 
-  AddCommand('p1_name', GameCVars);
-  AddCommand('p2_name', GameCVars);
-  AddCommand('p1_color', GameCVars);
-  AddCommand('p2_color', GameCVars);
-  AddCommand('r_showscore', GameCVars);
-  AddCommand('r_showlives', GameCVars);
-  AddCommand('r_showstat', GameCVars);
-  AddCommand('r_showkillmsg', GameCVars);
-  AddCommand('r_showspect', GameCVars);
-  AddCommand('r_showping', GameCVars);
+  AddCommand('p1_name', PlayerSettingsCVars);
+  AddCommand('p2_name', PlayerSettingsCVars);
+  AddCommand('p1_color', PlayerSettingsCVars);
+  AddCommand('p2_color', PlayerSettingsCVars);
+  AddCommand('p1_model', PlayerSettingsCVars);
+  AddCommand('p2_model', PlayerSettingsCVars);
+  AddCommand('p1_team', PlayerSettingsCVars);
+  AddCommand('p2_team', PlayerSettingsCVars);
+  AddCommand('p1_autoswitch', PlayerSettingsCVars);
+  AddCommand('p2_autoswitch', PlayerSettingsCVars);
+  AddCommand('p1_switch_empty', PlayerSettingsCVars);
+  AddCommand('p2_switch_empty', PlayerSettingsCVars);
+  AddCommand('p1_skip_fist', PlayerSettingsCVars);
+  AddCommand('p2_skip_fist', PlayerSettingsCVars);
+  AddCommand('p1_priority_kastet', PlayerSettingsCVars);
+  AddCommand('p2_priority_kastet', PlayerSettingsCVars);
+  AddCommand('p1_priority_saw', PlayerSettingsCVars);
+  AddCommand('p2_priority_saw', PlayerSettingsCVars);
+  AddCommand('p1_priority_pistol', PlayerSettingsCVars);
+  AddCommand('p2_priority_pistol', PlayerSettingsCVars);  
+  AddCommand('p1_priority_shotgun1', PlayerSettingsCVars);
+  AddCommand('p2_priority_shotgun1', PlayerSettingsCVars);
+  AddCommand('p1_priority_shotgun2', PlayerSettingsCVars);
+  AddCommand('p2_priority_shotgun2', PlayerSettingsCVars);
+  AddCommand('p1_priority_chaingun', PlayerSettingsCVars);
+  AddCommand('p2_priority_chaingun', PlayerSettingsCVars);
+  AddCommand('p1_priority_rocketlauncher', PlayerSettingsCVars);
+  AddCommand('p2_priority_rocketlauncher', PlayerSettingsCVars);
+  AddCommand('p1_priority_plasma', PlayerSettingsCVars);
+  AddCommand('p2_priority_plasma', PlayerSettingsCVars);
+  AddCommand('p1_priority_bfg', PlayerSettingsCVars);
+  AddCommand('p2_priority_bfg', PlayerSettingsCVars);
+  AddCommand('p1_priority_super', PlayerSettingsCVars);
+  AddCommand('p2_priority_super', PlayerSettingsCVars);
+  AddCommand('p1_priority_flamethrower', PlayerSettingsCVars);
+  AddCommand('p2_priority_flamethrower', PlayerSettingsCVars);
+  AddCommand('p1_priority_berserk', PlayerSettingsCVars);
+  AddCommand('p2_priority_berserk', PlayerSettingsCVars);  
+
+  AddCommand('g_max_particles', GameCVars);
+  AddCommand('g_max_shells', GameCVars);
+  AddCommand('g_max_gibs', GameCVars);
+  AddCommand('g_max_corpses', GameCVars);
   AddCommand('g_gamemode', GameCVars);
   AddCommand('g_friendlyfire', GameCVars);
+  AddCommand('g_friendly_hit_trace', GameCVars);
+  AddCommand('g_friendly_hit_projectile', GameCVars);
+  AddCommand('g_friendly_absorb_damage', GameCVars);
   AddCommand('g_weaponstay', GameCVars);
   AddCommand('g_allow_exit', GameCVars);
+  AddCommand('g_dm_keys', GameCVars);
   AddCommand('g_allow_monsters', GameCVars);
+  AddCommand('g_allow_dropflag', GameCVars);
+  AddCommand('g_throw_flag', GameCVars);
   AddCommand('g_bot_vsmonsters', GameCVars);
   AddCommand('g_bot_vsplayers', GameCVars);
+  AddCommand('g_max_bots', GameCVars); // intentionally not whitelisted
   AddCommand('g_scorelimit', GameCVars);
   AddCommand('g_timelimit', GameCVars);
   AddCommand('g_maxlives', GameCVars);
-  AddCommand('g_warmuptime', GameCVars);
-  AddCommand('net_interp', GameCVars);
-  AddCommand('net_forceplayerupdate', GameCVars);
-  AddCommand('net_predictself', GameCVars);
-  AddCommand('sv_name', GameCVars);
-  AddCommand('sv_passwd', GameCVars);
-  AddCommand('sv_maxplrs', GameCVars);
-  AddCommand('sv_public', GameCVars);
+  AddCommand('g_warmup_time', GameCVars);
+  AddCommand('g_spawn_invul', GameCVars);
+  AddCommand('g_item_respawn_time', GameCVars);
   AddCommand('sv_intertime', GameCVars);
 
-  AddCommand('quit', GameCommands);
-  AddCommand('exit', GameCommands);
+  AddCommand('sv_name', NetServerCVars);
+  AddCommand('sv_passwd', NetServerCVars);
+  AddCommand('sv_maxplrs', NetServerCVars);
+  AddCommand('sv_public', NetServerCVars);
+  AddCommand('sv_port', NetServerCVars);
+
   AddCommand('pause', GameCommands);
   AddCommand('endgame', GameCommands);
   AddCommand('restart', GameCommands);
@@ -933,6 +1110,8 @@ begin
   AddCommand('bot_removeall', GameCommands);
   AddCommand('chat', GameCommands);
   AddCommand('teamchat', GameCommands);
+  AddCommand('announce', GameCommands);
+  AddCommand('an', GameCommands);
   AddCommand('game', GameCommands);
   AddCommand('host', GameCommands);
   AddCommand('map', GameCommands);
@@ -944,16 +1123,21 @@ begin
   AddCommand('ready', GameCommands);
   AddCommand('kick', GameCommands);
   AddCommand('kick_id', GameCommands);
+  AddCommand('kick_pid', GameCommands);
   AddCommand('ban', GameCommands);
-  AddCommand('permban', GameCommands);
   AddCommand('ban_id', GameCommands);
+  AddCommand('ban_pid', GameCommands);
+  AddCommand('permban', GameCommands);
   AddCommand('permban_id', GameCommands);
+  AddCommand('permban_pid', GameCommands);
+  AddCommand('permban_ip', GameCommands);
   AddCommand('unban', GameCommands);
   AddCommand('connect', GameCommands);
   AddCommand('disconnect', GameCommands);
   AddCommand('reconnect', GameCommands);
   AddCommand('say', GameCommands);
   AddCommand('tell', GameCommands);
+  AddCommand('centerprint', GameCommands);
   AddCommand('overtime', GameCommands);
   AddCommand('rcon_password', GameCommands);
   AddCommand('rcon', GameCommands);
@@ -962,9 +1146,20 @@ begin
   AddCommand('clientlist', GameCommands);
   AddCommand('event', GameCommands);
   AddCommand('screenshot', GameCommands);
+  AddCommand('weapnext', GameCommands);
+  AddCommand('weapprev', GameCommands);
   AddCommand('weapon', GameCommands);
+  AddCommand('dropflag', GameCommands);
+  AddCommand('p1_weapnext', GameCommands);
+  AddCommand('p1_weapprev', GameCommands);
   AddCommand('p1_weapon', GameCommands);
+  AddCommand('p1_weapbest', GameCommands);
+  AddCommand('p1_dropflag', GameCommands);
+  AddCommand('p2_weapnext', GameCommands);
+  AddCommand('p2_weapprev', GameCommands);
   AddCommand('p2_weapon', GameCommands);
+  AddCommand('p2_weapbest', GameCommands);
+  AddCommand('p2_dropflag', GameCommands);
 
   AddCommand('god', GameCheats);
   AddCommand('notarget', GameCheats);
@@ -987,8 +1182,6 @@ begin
   AddAction('scores', ACTION_SCORES);
   AddAction('activate', ACTION_ACTIVATE);
   AddAction('strafe', ACTION_STRAFE);
-  AddAction('weapnext', ACTION_WEAPNEXT);
-  AddAction('weapprev', ACTION_WEAPPREV);
 
   WhitelistCommand('say');
   WhitelistCommand('tell');
@@ -999,7 +1192,10 @@ begin
   WhitelistCommand('endmap');
   WhitelistCommand('restart');
   WhitelistCommand('kick');
+  WhitelistCommand('kick_pid');
   WhitelistCommand('ban');
+  WhitelistCommand('ban_pid');
+  WhitelistCommand('centerprint');
 
   WhitelistCommand('addbot');
   WhitelistCommand('bot_add');
@@ -1009,17 +1205,31 @@ begin
 
   WhitelistCommand('g_gamemode');
   WhitelistCommand('g_friendlyfire');
+  WhitelistCommand('g_friendly_hit_trace');
+  WhitelistCommand('g_friendly_hit_projectile');
+  WhitelistCommand('g_friendly_absorb_damage');
   WhitelistCommand('g_weaponstay');
   WhitelistCommand('g_allow_exit');
+  WhitelistCommand('g_dm_keys');
   WhitelistCommand('g_allow_monsters');
+  WhitelistCommand('g_bot_vsmonsters');
+  WhitelistCommand('g_bot_vsplayers');
   WhitelistCommand('g_scorelimit');
   WhitelistCommand('g_timelimit');
+  WhitelistCommand('g_maxlives');
+  WhitelistCommand('g_warmup_time');
+  WhitelistCommand('g_spawn_invul');
+  WhitelistCommand('g_item_respawn_time');
 
   g_Console_ResetBinds;
-  g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
-  g_Console_ReadConfig(GameDir + '/autoexec.cfg');
+  g_Console_ReadConfig(gConfigScript);
+  g_Console_ReadConfig(autoexecScript);
   gParsingBinds := False;
+end;
 
+procedure g_Console_Init;
+begin
+  g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
   g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
   g_Console_Add('');
 end;
@@ -1688,13 +1898,14 @@ begin
   Result := gConsoleShow
 end;
 
-procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = '');
+procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False);
 begin
   //e_LogWritefln('bind "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), cmd, key]);
   ASSERT(key >= 0);
   ASSERT(key < e_MaxInputKeys);
   if key > 0 then
   begin
+    gInputBinds[key].rep := rep;
     gInputBinds[key].down := ParseAlias(down);
     gInputBinds[key].up := ParseAlias(up);
   end;
@@ -1790,6 +2001,21 @@ begin
   menu_toggled := False
 end;
 
+procedure g_Console_ProcessBindRepeat (key: Integer);
+  var i: Integer;
+begin
+  if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then
+  begin
+    KeyPress(key); // key repeat in menus and shit
+    Exit;
+  end;
+  if BindsAllowed(key) and gInputBinds[key].rep then
+  begin
+    for i := 0 to High(gInputBinds[key].down) do
+      g_Console_Process(gInputBinds[key].down[i], True);
+  end;
+end;
+
 procedure g_Console_ResetBinds;
   var i: Integer;
 begin
@@ -1805,9 +2031,10 @@ begin
   g_Console_BindKey(IK_SPACE, '+p1_jump', '-p1_jump');
   g_Console_BindKey(IK_H, '+p1_attack', '-p1_attack');
   g_Console_BindKey(IK_J, '+p1_activate', '-p1_activate');
-  g_Console_BindKey(IK_E, '+p1_weapnext', '-p1_weapnext');
-  g_Console_BindKey(IK_Q, '+p1_weapprev', '-p1_weapprev');
   g_Console_BindKey(IK_ALT, '+p1_strafe', '-p1_strafe');
+  g_Console_BindKey(IK_E, 'p1_weapnext', '', True);
+  g_Console_BindKey(IK_Q, 'p1_weapprev', '', True);
+  g_Console_BindKey(IK_R, 'p1_dropflag', '');
   g_Console_BindKey(IK_1, 'p1_weapon 1');
   g_Console_BindKey(IK_2, 'p1_weapon 2');
   g_Console_BindKey(IK_3, 'p1_weapon 3');
@@ -1836,9 +2063,9 @@ begin
     g_Console_BindKey(e_JoyButtonToKey(i, 2), '+p' + IntToStr(i mod 2 + 1) + '_jump', '-p' + IntToStr(i mod 2 + 1) + '_jump');
     g_Console_BindKey(e_JoyButtonToKey(i, 0), '+p' + IntToStr(i mod 2 + 1) + '_attack', '-p' + IntToStr(i mod 2 + 1) + '_attack');
     g_Console_BindKey(e_JoyButtonToKey(i, 3), '+p' + IntToStr(i mod 2 + 1) + '_activate', '-p' + IntToStr(i mod 2 + 1) + '_activate');
-    g_Console_BindKey(e_JoyButtonToKey(i, 1), '+p' + IntToStr(i mod 2 + 1) + '_weapnext', '-p' + IntToStr(i mod 2 + 1) + '_weapnext');
-    g_Console_BindKey(e_JoyButtonToKey(i, 4), '+p' + IntToStr(i mod 2 + 1) + '_weapprev', '-p' + IntToStr(i mod 2 + 1) + '_weapprev');
     g_Console_BindKey(e_JoyButtonToKey(i, 7), '+p' + IntToStr(i mod 2 + 1) + '_strafe', '-p' + IntToStr(i mod 2 + 1) + '_strafe');
+    g_Console_BindKey(e_JoyButtonToKey(i, 1), 'p' + IntToStr(i mod 2 + 1) + '_weapnext', '', True);
+    g_Console_BindKey(e_JoyButtonToKey(i, 4), 'p' + IntToStr(i mod 2 + 1) + '_weapprev', '', True);
     g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu');
   end;
 
@@ -1852,9 +2079,9 @@ begin
   g_Console_BindKey(VK_JUMP, '+jump', '-jump');
   g_Console_BindKey(VK_FIRE, '+attack', '-attack');
   g_Console_BindKey(VK_OPEN, '+activate', '-activate');
-  g_Console_BindKey(VK_NEXT, '+weapnext', '-weapnext');
-  g_Console_BindKey(VK_PREV, '+weapprev', '-weapprev');
   g_Console_BindKey(VK_STRAFE, '+strafe', '-strafe');
+  g_Console_BindKey(VK_NEXT, 'weapnext', '', True);
+  g_Console_BindKey(VK_PREV, 'weapprev', '', True);
   g_Console_BindKey(VK_0, 'weapon 1');
   g_Console_BindKey(VK_1, 'weapon 2');
   g_Console_BindKey(VK_2, 'weapon 3');
@@ -1878,8 +2105,10 @@ end;
 procedure g_Console_ReadConfig (filename: String);
   var f: TextFile; s: AnsiString; i, len: Integer;
 begin
-  if FileExists(filename) then
+  e_LogWritefln('g_Console_ReadConfig (1) "%s"', [filename]);
+  if e_FindResource(ConfigDirs, filename, false) = true then
   begin
+    e_LogWritefln('g_Console_ReadConfig (2) "%s"', [filename]);
     AssignFile(f, filename);
     Reset(f);
     while not EOF(f) do
@@ -1902,10 +2131,26 @@ end;
 
 procedure g_Console_WriteConfig (filename: String);
   var f: TextFile; i, j: Integer;
+
+  procedure WriteFlag(name: string; flag: LongWord);
+  begin
+    WriteLn(f, name, IfThen(LongBool(gsGameFlags and flag), 1, 0));
+  end;
+
+  function FormatTeam(team: Byte): string;
+  begin
+    if team = TEAM_BLUE then
+      result := 'blue'
+    else
+      result := 'red';
+  end;
+
 begin
   AssignFile(f, filename);
   Rewrite(f);
-  WriteLn(f, '// generated by doom2d, do not modify');
+  WriteLn(f, '// ' + configComment);
+
+  // binds
   WriteLn(f, 'unbindall');
   for i := 0 to e_MaxInputKeys - 1 do
     if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then
@@ -1916,7 +2161,97 @@ begin
       if Length(gInputBinds[i].up) > 0 then
         Write(f, ' ', QuoteStr(GetCommandString(gInputBinds[i].up)));
       WriteLn(f, '');
+      if gInputBinds[i].rep then
+        WriteLn(f, 'bindrep ', e_KeyNames[i]);
     end;
+
+  // lang
+  if gAskLanguage then
+    WriteLn(f, 'g_language ask')
+  else
+    WriteLn(f, 'g_language ', gLanguage);
+
+  // net server
+  WriteLn(f, 'sv_name ', QuoteStr(NetServerName));
+  WriteLn(f, 'sv_passwd ', QuoteStr(NetPassword));
+  WriteLn(f, 'sv_maxplrs ', NetMaxClients);
+  WriteLn(f, 'sv_port ', NetPort);
+  WriteLn(f, 'sv_public ', IfThen(NetUseMaster, 1, 0));
+
+  // game settings
+  WriteLn(f, 'g_max_particles ', g_GFX_GetMax());
+  WriteLn(f, 'g_max_shells ', g_Shells_GetMax());
+  WriteLn(f, 'g_max_gibs ', g_Gibs_GetMax());
+  WriteLn(f, 'g_max_corpses ', g_Corpses_GetMax());
+  WriteLn(f, 'sv_intertime ', gDefInterTime);
+
+  // gameplay settings
+  WriteLn(f, 'g_gamemode ', gsGameMode);
+  WriteLn(f, 'g_scorelimit ', gsGoalLimit);
+  WriteLn(f, 'g_timelimit ', gsTimeLimit);
+  WriteLn(f, 'g_maxlives ', gsMaxLives);
+  WriteLn(f, 'g_item_respawn_time ', gsItemRespawnTime);
+  WriteLn(f, 'g_spawn_invul ', gsSpawnInvul);
+  WriteLn(f, 'g_warmup_time ', gsWarmupTime);
+
+  WriteFlag('g_friendlyfire ', GAME_OPTION_TEAMDAMAGE);
+  WriteFlag('g_friendly_hit_trace ', GAME_OPTION_TEAMHITTRACE);
+  WriteFlag('g_friendly_hit_projectile ', GAME_OPTION_TEAMHITPROJECTILE);
+  WriteFlag('g_allow_exit ', GAME_OPTION_ALLOWEXIT);
+  WriteFlag('g_allow_monsters ', GAME_OPTION_MONSTERS);
+  WriteFlag('g_allow_dropflag ', GAME_OPTION_ALLOWDROPFLAG);
+  WriteFlag('g_throw_flag ', GAME_OPTION_THROWFLAG);
+  WriteFlag('g_dm_keys ', GAME_OPTION_DMKEYS);
+  WriteFlag('g_weaponstay ', GAME_OPTION_WEAPONSTAY);
+  WriteFlag('g_bot_vsmonsters ', GAME_OPTION_BOTVSMONSTER);
+  WriteFlag('g_bot_vsplayers ', GAME_OPTION_BOTVSPLAYER);
+
+  // players
+  with gPlayer1Settings do
+  begin
+    WriteLn(f, 'p1_name ', QuoteStr(Name));
+    WriteLn(f, 'p1_color ', Color.R, ' ', Color.G, ' ', Color.B);
+    WriteLn(f, 'p1_model ', QuoteStr(Model));
+    WriteLn(f, 'p1_team ', FormatTeam(Team));
+    WriteLn(f, 'p1_autoswitch ', WeaponSwitch);
+    WriteLn(f, 'p1_switch_empty ', SwitchToEmpty);
+    WriteLn(f, 'p1_priority_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET]));
+    WriteLn(f, 'p1_priority_saw ', Max(0, WeaponPreferences[WEAPON_SAW]));
+    WriteLn(f, 'p1_priority_pistol ', Max(0, WeaponPreferences[WEAPON_PISTOL]));
+    WriteLn(f, 'p1_priority_shotgun1 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1]));    
+    WriteLn(f, 'p1_priority_shotgun2 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN2] ));
+    WriteLn(f, 'p1_priority_chaingun ', Max(0, WeaponPreferences[WEAPON_CHAINGUN]));    
+    WriteLn(f, 'p1_priority_rocketlauncher ', Max(0, WeaponPreferences[WEAPON_ROCKETLAUNCHER]));    
+    WriteLn(f, 'p1_priority_plasma ', Max(0, WeaponPreferences[WEAPON_PLASMA]));    
+    WriteLn(f, 'p1_priority_bfg ', Max(0, WeaponPreferences[WEAPON_BFG]));
+    WriteLn(f, 'p1_priority_super ', Max(0, WeaponPreferences[WEAPON_SUPERPULEMET]));                         
+    WriteLn(f, 'p1_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER]));
+    WriteLn(f, 'p1_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1]));    
+    //
+  end;
+  with gPlayer2Settings do
+  begin
+    WriteLn(f, 'p2_name ', QuoteStr(Name));
+    WriteLn(f, 'p2_color ', Color.R, ' ', Color.G, ' ', Color.B);
+    WriteLn(f, 'p2_model ', QuoteStr(Model));
+    WriteLn(f, 'p2_team ', FormatTeam(Team));
+    WriteLn(f, 'p2_autoswitch ', WeaponSwitch);
+    WriteLn(f, 'p2_switch_empty ', SwitchToEmpty);
+    WriteLn(f, 'p2_priority_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET]));
+    WriteLn(f, 'p2_priority_saw ', Max(0, WeaponPreferences[WEAPON_SAW]));
+    WriteLn(f, 'p2_priority_pistol ', Max(0, WeaponPreferences[WEAPON_PISTOL]));
+    WriteLn(f, 'p2_priority_shotgun1 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1]));
+    WriteLn(f, 'p2_priority_shotgun2 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1]));
+    WriteLn(f, 'p2_priority_chaingun ', Max(0, WeaponPreferences[WEAPON_CHAINGUN]));
+    WriteLn(f, 'p2_priority_rocketlauncher ', Max(0, WeaponPreferences[WEAPON_ROCKETLAUNCHER]));
+    WriteLn(f, 'p2_priority_plasma ', Max(0, WeaponPreferences[WEAPON_PLASMA]));
+    WriteLn(f, 'p2_priority_bfg ', Max(0, WeaponPreferences[WEAPON_BFG]));
+    WriteLn(f, 'p2_priority_super ', Max(0, WeaponPreferences[WEAPON_SUPERPULEMET]));
+    WriteLn(f, 'p2_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER]));
+    WriteLn(f, 'p2_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1]));       
+  end;
+
+  // all cvars
   for i := 0 to High(commands) do
   begin
     if not commands[i].cheat then
@@ -1930,6 +2265,14 @@ begin
       begin
         WriteLn(f, commands[i].cmd, ' ', PInteger(commands[i].ptr)^)
       end
+      else if @commands[i].procEx = @wordVarHandler then
+      begin
+        WriteLn(f, commands[i].cmd, ' ', PWord(commands[i].ptr)^)
+      end
+      else if @commands[i].procEx = @dwordVarHandler then
+      begin
+        WriteLn(f, commands[i].cmd, ' ', PCardinal(commands[i].ptr)^)
+      end
       else if @commands[i].procEx = @singleVarHandler then
       begin
         WriteLn(f, commands[i].cmd, ' ', PVarSingle(commands[i].ptr).val^:0:6)
@@ -1943,17 +2286,25 @@ begin
       end
     end
   end;
+
+  WriteLn(f, 'r_maxfps ', gMaxFPS);
+  WriteLn(f, 'r_reset');
   CloseFile(f)
 end;
 
 procedure g_Console_WriteGameConfig;
+  var s: AnsiString;
 begin
-  if gParsingBinds then
-    Exit;
-  g_Console_WriteConfig(GameDir + '/dfconfig.cfg');
+  if gParsingBinds = false then
+  begin
+    s := e_GetWriteableDir(ConfigDirs);
+    g_Console_WriteConfig(e_CatPath(s, gConfigScript))
+  end
 end;
 
-initialization
+procedure Init;
+  var i: Integer;
+begin
   conRegVar('chat_at_top', @ChatTop, 'draw chat at top border', 'draw chat at top border');
   conRegVar('console_height', @ConsoleHeight, 0.0, 1.0, 'set console size', 'set console size');
   conRegVar('console_trans', @ConsoleTrans, 0.0, 1.0, 'set console transparency', 'set console transparency');
@@ -1967,4 +2318,11 @@ initialization
 {$ENDIF}
   ConsoleTrans := 0.1;
   ConsoleStep := 0.07;
+  conRegVar('d_eres', @debug_e_res, '', '');
+  for i := 1 to e_MaxJoys do
+    conRegVar('joy' + IntToStr(i) + '_deadzone', @e_JoystickDeadzones[i - 1], '', '')
+end;
+
+initialization
+  Init
 end.