X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=3005340534c6eec96e5553e1d1e7eef3eb3a51e9;hb=a3ffbadf19a1f613bf10d6bf5205267b591c1752;hp=c38b476408f08dc42aba24a0b6ca04e000fc4e06;hpb=49466ddcf6c0bb9d25a8f713d632f37ddc0474d1;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index c38b476..3005340 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -30,16 +30,23 @@ 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;
+
+  var (* private state *)
+    Line: AnsiString;
+    CPos: Word;
+    conSkipLines: Integer;
+    MsgArray: Array [0..4] of record
+      Msg: AnsiString;
+      Time: Word;
+    end;
 
 procedure g_Console_Init;
-procedure g_Console_SysInit;
+procedure g_Console_Initialize;
+procedure g_Console_Finalize;
 procedure g_Console_Update;
-procedure g_Console_Draw (MessagesOnly: Boolean = False);
 procedure g_Console_Char (C: AnsiChar);
 procedure g_Console_Control (K: Word);
 procedure g_Console_Process (L: AnsiString; quiet: Boolean=false);
@@ -54,8 +61,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);
@@ -75,7 +83,11 @@ function conGetBoolArg (p: SSArray; idx: Integer): Integer;
 function conParseFloat (var res: Single; const s: AnsiString): Boolean;
 
 const
-  defaultConfigScript = 'dfconfig.cfg';
+  {$IFDEF HEADLESS}
+    defaultConfigScript = 'dfserver.cfg';
+  {$ELSE}
+    defaultConfigScript = 'dfconfig.cfg';
+  {$ENDIF}
 
 var
   gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
@@ -90,12 +102,30 @@ var
 implementation
 
 uses
-  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;
+  {$IFDEF ENABLE_MENU}
+    g_gui, g_menu,
+  {$ENDIF}
+  {$IFDEF ENABLE_TOUCH}
+    g_system,
+  {$ENDIF}
+  {$IFDEF ENABLE_GFX}
+    g_gfx,
+  {$ENDIF}
+  {$IFDEF ENABLE_GIBS}
+    g_gibs,
+  {$ENDIF}
+  {$IFDEF ENABLE_SHELLS}
+    g_shells,
+  {$ENDIF}
+  {$IFDEF ENABLE_CORPSES}
+    g_corpses,
+  {$ENDIF}
+  e_input, g_game, g_player, g_items,
+  SysUtils, g_basic, g_options, Math, e_res,
+  g_language, g_net, g_netmsg, e_log, conbuf, g_weapons,
+  Keyboard;
 
 const
-  autoexecScript = 'autoexec.cfg';
   configComment = 'generated by doom2d, do not modify';
 
 type
@@ -127,65 +157,47 @@ const
   MsgTime = 144;
   MaxScriptRecursion = 16;
 
-  DEBUG_STRING = 'DEBUG MODE';
-
 var
-  ID: DWORD;
   RecursionDepth: Word = 0;
   RecursionLimitHit: Boolean = False;
-  Cons_Y: SmallInt;
-  ConsoleHeight: Single;
-  Cons_Shown: Boolean; // draw console
   InputReady: Boolean; // allow text input in console/chat
-  Line: AnsiString;
-  CPos: Word;
   //ConsoleHistory: SSArray;
   CommandHistory: SSArray;
   Whitelist: SSArray;
   commands: Array of TCommand = nil;
   Aliases: Array of TAlias = nil;
   CmdIndex: Word;
-  conSkipLines: Integer = 0;
-  MsgArray: Array [0..4] of record
-                              Msg: AnsiString;
-                              Time: Word;
-                            end;
 
   gInputBinds: Array [0..e_MaxInputKeys - 1] of record
+    rep: Boolean;
     down, up: SSArray;
   end;
-  menu_toggled: BOOLEAN; (* hack for menu controls *)
-  ChatTop: BOOLEAN;
-  ConsoleStep: Single;
-  ConsoleTrans: Single;
 
+  menu_toggled: BOOLEAN; (* hack for menu controls *)
+  ConsoleStdIn: Boolean;
 
 procedure g_Console_Switch;
 begin
-  Cons_Y := Min(0, Max(Cons_Y, -Floor(gScreenHeight * ConsoleHeight)));
-  if Cons_Shown = False then
-    Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
   gChatShow := False;
   gConsoleShow := not gConsoleShow;
-  Cons_Shown := True;
   InputReady := False;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+  {$IFDEF ENABLE_TOUCH}
+    sys_ShowKeyboard(gConsoleShow or gChatShow);
+  {$ENDIF}
 end;
 
 procedure g_Console_Chat_Switch (Team: Boolean = False);
 begin
   if not g_Game_IsNet then Exit;
-  Cons_Y := Min(0, Max(Cons_Y, -Floor(gScreenHeight * ConsoleHeight)));
-  if Cons_Shown = False then
-    Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
   gConsoleShow := False;
   gChatShow := not gChatShow;
   gChatTeam := Team;
-  Cons_Shown := True;
   InputReady := False;
   Line := '';
   CPos := 1;
-  g_Touch_ShowKeyboard(gConsoleShow or gChatShow);
+  {$IFDEF ENABLE_TOUCH}
+    sys_ShowKeyboard(gConsoleShow or gChatShow);
+  {$ENDIF}
 end;
 
 // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks
@@ -830,6 +842,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
@@ -851,10 +891,12 @@ begin
   'unbindall':
     for i := 0 to e_MaxInputKeys - 1 do
       g_Console_BindKey(i, '');
+{$IFDEF ENABLE_TOUCH}
   'showkeyboard':
-    g_Touch_ShowKeyboard(True);
+    sys_ShowKeyboard(True);
   'hidekeyboard':
-    g_Touch_ShowKeyboard(False);
+    sys_ShowKeyboard(False);
+{$ENDIF}
   'togglemenu':
     begin
       if gConsoleShow then
@@ -862,7 +904,9 @@ begin
       else if gChatShow then
         g_Console_Chat_Switch
       else
+      begin
         KeyPress(VK_ESCAPE);
+      end;
       menu_toggled := True
     end;
   'toggleconsole':
@@ -931,13 +975,33 @@ begin
   end
 end;
 
-procedure g_Console_SysInit;
+procedure ReadStdIn;
+var
+  K: Char;
+  KEv: TKeyEvent;
+begin
+  gConsoleShow := True;
+  InputReady := True;
+  // one key per frame
+  KEv := PollKeyEvent();
+  if KEv <> 0 then
+  begin
+    K := GetKeyEventChar(TranslateKeyEvent(GetKeyEvent()));
+    Write(K);
+    case K of
+      #8: g_Console_Control(IK_BACKSPACE);
+      #10, #13: g_Console_Control(IK_RETURN);
+      #32..#126: g_Console_Char(K);
+      // arrow keys and DEL all return 0 for some reason, so fuck em
+    end;
+  end;
+end;
+
+procedure g_Console_Initialize;
   var a: Integer;
 begin
-  Cons_Y := -Floor(gScreenHeight * ConsoleHeight);
   gConsoleShow := False;
   gChatShow := False;
-  Cons_Shown := False;
   InputReady := False;
   CPos := 1;
 
@@ -953,9 +1017,12 @@ begin
   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);
@@ -999,19 +1066,59 @@ begin
   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_force_model', GameCVars);
+  AddCommand('g_force_model_name', 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);
@@ -1037,6 +1144,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);
@@ -1048,10 +1157,14 @@ 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);
@@ -1067,9 +1180,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);
@@ -1092,8 +1216,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');
@@ -1104,7 +1226,9 @@ begin
   WhitelistCommand('endmap');
   WhitelistCommand('restart');
   WhitelistCommand('kick');
+  WhitelistCommand('kick_pid');
   WhitelistCommand('ban');
+  WhitelistCommand('ban_pid');
   WhitelistCommand('centerprint');
 
   WhitelistCommand('addbot');
@@ -1115,53 +1239,57 @@ 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_dm_keys');
+  WhitelistCommand('g_maxlives');
+  WhitelistCommand('g_warmup_time');
   WhitelistCommand('g_spawn_invul');
   WhitelistCommand('g_item_respawn_time');
-  WhitelistCommand('g_warmup_time');
 
   g_Console_ResetBinds;
   g_Console_ReadConfig(gConfigScript);
-  g_Console_ReadConfig(autoexecScript);
+//  g_Console_ReadConfig(autoexecScript);
+  g_Console_ReadConfig('autoexec.cfg');
+
   gParsingBinds := False;
 end;
 
+procedure g_Console_Finalize;
+begin
+
+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('');
+{$IFDEF HEADLESS}
+  if ConsoleStdIn then
+  begin
+    InitKeyboard();
+    conbufStdOutRawMode := true;
+  end;
+{$ENDIF}
 end;
 
 procedure g_Console_Update;
 var
-  a, b, Step: Integer;
+  a, b: Integer;
 begin
-  if Cons_Shown then
-  begin
-    Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
-    if gConsoleShow then
-    begin
-      (* Open animation *)
-      Cons_Y := Min(Cons_Y + Step, 0);
-      InputReady := True
-    end
-    else
-    begin
-      (* Close animation *)
-      Cons_Y := Max(Cons_Y - Step, -Floor(gScreenHeight * ConsoleHeight));
-      Cons_Shown := Cons_Y > -Floor(gScreenHeight * ConsoleHeight);
-      InputReady := False
-    end;
-
-    if gChatShow then
-      InputReady := True
-  end;
+{$IFDEF HEADLESS}
+  if ConsoleStdIn then
+    ReadStdIn();
+{$ENDIF}
+  InputReady := gConsoleShow or gChatShow;
 
   a := 0;
   while a <= High(MsgArray) do
@@ -1188,138 +1316,6 @@ begin
   end;
 end;
 
-
-procedure drawConsoleText ();
-var
-  CWidth, CHeight: Byte;
-  ty: Integer;
-  sp, ep: LongWord;
-  skip: Integer;
-
-  procedure putLine (sp, ep: LongWord);
-  var
-    p: LongWord;
-    wdt, cw: Integer;
-  begin
-    p := sp;
-    wdt := 0;
-    while p <> ep do
-    begin
-      cw := e_TextureFontCharWidth(cbufAt(p), gStdFont);
-      if wdt+cw > gScreenWidth-8 then break;
-      //e_TextureFontPrintChar(X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False);
-      Inc(wdt, cw);
-      cbufNext(p);
-    end;
-    if p <> ep then putLine(p, ep); // do rest of the line first
-    // now print our part
-    if skip = 0 then
-    begin
-      ep := p;
-      p := sp;
-      wdt := 2;
-      while p <> ep do
-      begin
-        cw := e_TextureFontCharWidth(cbufAt(p), gStdFont);
-        e_TextureFontPrintCharEx(wdt, ty, cbufAt(p), gStdFont);
-        Inc(wdt, cw);
-        cbufNext(p);
-      end;
-      Dec(ty, CHeight);
-    end
-    else
-    begin
-      Dec(skip);
-    end;
-  end;
-
-begin
-  e_TextureFontGetSize(gStdFont, CWidth, CHeight);
-  ty := Floor(gScreenHeight * ConsoleHeight) - 4 - 2 * CHeight - Abs(Cons_Y);
-  skip := conSkipLines;
-  cbufLastLine(sp, ep);
-  repeat
-    putLine(sp, ep);
-    if ty+CHeight <= 0 then break;
-  until not cbufLineUp(sp, ep);
-end;
-
-procedure g_Console_Draw(MessagesOnly: Boolean = False);
-var
-  CWidth, CHeight: Byte;
-  mfW, mfH: Word;
-  a, b, offset_y: Integer;
-begin
-  e_TextureFontGetSize(gStdFont, CWidth, CHeight);
-
-  if ChatTop and gChatShow then
-    offset_y := CHeight
-  else
-    offset_y := 0;
-
-  for a := 0 to High(MsgArray) do
-    if MsgArray[a].Time > 0 then
-      e_TextureFontPrintFmt(0, offset_y + CHeight * a, MsgArray[a].Msg, gStdFont, True);
-
-  if MessagesOnly then Exit;
-
-  if gChatShow then
-  begin
-    if ChatTop then
-      offset_y := 0
-    else
-      offset_y := gScreenHeight - CHeight - 1;
-    if gChatTeam then
-    begin
-      e_TextureFontPrintEx(0, offset_y, 'say team> ' + Line, gStdFont, 255, 255, 255, 1, True);
-      e_TextureFontPrintEx((CPos + 9) * CWidth, offset_y, '_', gStdFont, 255, 255, 255, 1, True);
-    end
-    else
-    begin
-      e_TextureFontPrintEx(0, offset_y, 'say> ' + Line, gStdFont, 255, 255, 255, 1, True);
-      e_TextureFontPrintEx((CPos + 4) * CWidth, offset_y, '_', gStdFont, 255, 255, 255, 1, True);
-    end
-  end;
-
-  if not Cons_Shown then
-    Exit;
-
-  if gDebugMode then
-  begin
-    e_CharFont_GetSize(gMenuFont, DEBUG_STRING, mfW, mfH);
-    a := (gScreenWidth - 2*mfW) div 2;
-    b := Cons_Y + (Floor(gScreenHeight * ConsoleHeight) - 2 * mfH) div 2;
-    e_CharFont_PrintEx(gMenuFont, a div 2, b div 2, DEBUG_STRING,
-                       _RGB(128, 0, 0), 2.0);
-  end;
-
-  e_DrawSize(ID, 0, Cons_Y, Round(ConsoleTrans * 255), False, False, gScreenWidth, Floor(gScreenHeight * ConsoleHeight));
-  e_TextureFontPrint(0, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - CHeight - 4, '> ' + Line, gStdFont);
-
-  drawConsoleText();
-  (*
-  if ConsoleHistory <> nil then
-  begin
-    b := 0;
-    if CHeight > 0 then
-      if Length(ConsoleHistory) > (Floor(gScreenHeight * ConsoleHeight) div CHeight) - 1 then
-        b := Length(ConsoleHistory) - (Floor(gScreenHeight * ConsoleHeight) div CHeight) + 1;
-
-    b := Max(b-Offset, 0);
-    d := Max(High(ConsoleHistory)-Offset, 0);
-
-    c := 2;
-    for a := d downto b do
-    begin
-      e_TextureFontPrintFmt(0, Floor(gScreenHeight * ConsoleHeight) - 4 - c * CHeight - Abs(Cons_Y), ConsoleHistory[a], gStdFont, True);
-      c := c + 1;
-    end;
-  end;
-  *)
-
-  e_TextureFontPrint((CPos + 1) * CWidth, Cons_Y + Floor(gScreenHeight * ConsoleHeight) - 21, '_', gStdFont);
-end;
-
 procedure g_Console_Char(C: AnsiChar);
 begin
   if InputReady and (gConsoleShow or gChatShow) then
@@ -1629,12 +1625,6 @@ begin
 
   //SetLength(ConsoleHistory, Length(ConsoleHistory)+1);
   //ConsoleHistory[High(ConsoleHistory)] := L;
-
-  (*
-{$IFDEF HEADLESS}
-  e_WriteLog('CON: ' + L, MSG_NOTIFY);
-{$ENDIF}
-  *)
 end;
 
 
@@ -1802,13 +1792,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]);
+  // e_LogWritefln('bind "%s" "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), down, up, 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;
@@ -1846,10 +1837,13 @@ begin
   i := 0;
   while (n >= 1) and (i < e_MaxInputKeys) do
   begin
-    if g_Console_MatchBind(i, down, up) then
+    if (i < VK_FIRSTKEY) or (i > VK_LASTKEY) then (* never show virtual keys in gui *)
     begin
-      result := i;
-      dec(n)
+      if g_Console_MatchBind(i, down, up) then
+      begin
+        result := i;
+        dec(n)
+      end;
     end;
     inc(i)
   end;
@@ -1869,15 +1863,23 @@ begin
 end;
 
 function BindsAllowed (key: Integer): Boolean;
+  var grab, active: Boolean;
 begin
   Result := False;
-  if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
+  {$IFDEF DISABLE_MENU}
+    grab := False;
+    active := False;
+  {$ELSE}
+    grab := g_GUIGrabInput;
+    active := g_ActiveWindow <> nil;
+  {$ENDIF}
+  if (not grab) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
   begin
     if gChatShow then
       Result := g_Console_MatchBind(key, 'togglemenu') or
                 g_Console_MatchBind(key, 'showkeyboard') or
                 g_Console_MatchBind(key, 'hidekeyboard')
-    else if gConsoleShow or (g_ActiveWindow <> nil) or (gGameSettings.GameType = GT_NONE) then
+    else if gConsoleShow or active or (gGameSettings.GameType = GT_NONE) then
       Result := g_Console_MatchBind(key, 'togglemenu') or
                 g_Console_MatchBind(key, 'toggleconsole') or
                 g_Console_MatchBind(key, 'showkeyboard') or
@@ -1904,6 +1906,26 @@ begin
   menu_toggled := False
 end;
 
+procedure g_Console_ProcessBindRepeat (key: Integer);
+  var i: Integer; active: Boolean;
+begin
+  {$IFDEF DISABLE_MENU}
+    active := False;
+  {$ELSE}
+    active := g_ActiveWindow <> nil;
+  {$ENDIF}
+  if gConsoleShow or gChatShow or active 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
@@ -1919,9 +1941,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');
@@ -1936,7 +1959,7 @@ begin
   g_Console_BindKey(IK_T, 'togglechat');
   g_Console_BindKey(IK_Y, 'toggleteamchat');
   g_Console_BindKey(IK_F11, 'screenshot');
-  g_Console_BindKey(IK_TAB, '+p1_scores', '-p1_scores');
+  g_Console_BindKey(IK_TAB, '+scores', '-scores');
   g_Console_BindKey(IK_PAUSE, 'pause');
   g_Console_BindKey(IK_F1, 'vote');
 
@@ -1950,9 +1973,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;
 
@@ -1966,9 +1989,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');
@@ -2024,7 +2047,16 @@ procedure g_Console_WriteConfig (filename: String);
     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
+  // e_LogWritefln('g_Console_WriteConfig: %s', [filename]);
   AssignFile(f, filename);
   Rewrite(f);
   WriteLn(f, '// ' + configComment);
@@ -2040,6 +2072,8 @@ 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
@@ -2056,15 +2090,25 @@ begin
   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());
+  {$IFDEF ENABLE_GFX}
+    WriteLn(f, 'g_max_particles ', g_GFX_GetMax());
+  {$ENDIF}
+  {$IFDEF ENABLE_SHELLS}
+    WriteLn(f, 'g_max_shells ', g_Shells_GetMax());
+  {$ENDIF}
+  {$IFDEF ENABLE_GIBS}
+    WriteLn(f, 'g_max_gibs ', g_Gibs_GetMax());
+  {$ENDIF}
+  {$IFDEF ENABLE_CORPSES}
+    WriteLn(f, 'g_max_corpses ', g_Corpses_GetMax());
+  {$ENDIF}
+  WriteLn(f, 'g_force_model ', g_Force_Model_Get());
+  WriteLn(f, 'g_force_model_name ', g_Forced_Model_GetName());
   WriteLn(f, 'sv_intertime ', gDefInterTime);
 
   // gameplay settings
   WriteLn(f, 'g_gamemode ', gsGameMode);
-  WriteLn(f, 'g_scorelimit ', gsGoalLimit);
+  WriteLn(f, 'g_scorelimit ', gsScoreLimit);
   WriteLn(f, 'g_timelimit ', gsTimeLimit);
   WriteLn(f, 'g_maxlives ', gsMaxLives);
   WriteLn(f, 'g_item_respawn_time ', gsItemRespawnTime);
@@ -2072,8 +2116,12 @@ begin
   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);
@@ -2085,12 +2133,43 @@ 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
@@ -2129,6 +2208,7 @@ begin
     end
   end;
 
+  WriteLn(f, 'r_maxfps ', gMaxFPS);
   WriteLn(f, 'r_reset');
   CloseFile(f)
 end;
@@ -2146,19 +2226,12 @@ end;
 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');
-  conRegVar('console_step', @ConsoleStep, 0.0, 1.0, 'set console animation speed', 'set console animation speed');
-{$IFDEF ANDROID}
-  ChatTop := True;
-  ConsoleHeight := 0.35;
+  conRegVar('console_stdin', @ConsoleStdIn, 'enable reading commands from stdin', 'enable reading commands from stdin');
+{$IFDEF HEADLESS}
+  ConsoleStdIn := True;
 {$ELSE}
-  ChatTop := False;
-  ConsoleHeight := 0.5;
+  ConsoleStdIn := False;
 {$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], '', '')
@@ -2166,4 +2239,11 @@ end;
 
 initialization
   Init
+
+{$IFDEF HEADLESS}
+finalization
+  DoneKeyboard;
+  conbufStdOutRawMode := false;
+{$ENDIF}
+
 end.