X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=5315b351b7aa8d4999688a60b5cd9c456d65ee37;hb=c55f7817903ddb9173e96819ec8723447b2d4c68;hp=8c0c41e0e22cb6282cb669e07e665a214f03a065;hpb=88999196d89648a7ba4f6367e2a882e0d56bc5b5;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 8c0c41e..5315b35 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -95,7 +95,8 @@ 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, g_weapons;
+  g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons,
+  Keyboard;
 
 const
   autoexecScript = 'autoexec.cfg';
@@ -162,6 +163,7 @@ var
   ChatTop: BOOLEAN;
   ConsoleStep: Single;
   ConsoleTrans: Single;
+  ConsoleStdIn: Boolean;
 
 
 procedure g_Console_Switch;
@@ -963,6 +965,28 @@ begin
   end
 end;
 
+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_SysInit;
   var a: Integer;
 begin
@@ -1037,9 +1061,13 @@ begin
   AddCommand('p1_team', PlayerSettingsCVars);
   AddCommand('p2_team', PlayerSettingsCVars);
   AddCommand('p1_autoswitch', PlayerSettingsCVars);
-  AddCommand('p2_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('p2_priority_kastet', PlayerSettingsCVars);
   AddCommand('p1_priority_saw', PlayerSettingsCVars);
   AddCommand('p2_priority_saw', PlayerSettingsCVars);
   AddCommand('p1_priority_pistol', PlayerSettingsCVars);
@@ -1067,6 +1095,8 @@ begin
   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);
@@ -1080,12 +1110,21 @@ begin
   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_warmup_time', GameCVars);
   AddCommand('g_spawn_invul', GameCVars);
   AddCommand('g_item_respawn_time', GameCVars);
+  AddCommand('g_item_time_random', GameCVars);
+  AddCommand('g_items_all_respawn_random', GameCVars);
+  AddCommand('g_items_help_respawn_random', GameCVars);
+  AddCommand('g_items_ammo_respawn_random', GameCVars);
+  AddCommand('g_items_weapon_respawn_random', GameCVars);
+  AddCommand('g_powerup_randomize_respawn', GameCVars);
+  AddCommand('g_powerup_respawn_time', GameCVars);
+  AddCommand('g_powerup_time_random', GameCVars);
   AddCommand('sv_intertime', GameCVars);
 
   AddCommand('sv_name', NetServerCVars);
@@ -1105,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);
@@ -1146,10 +1187,12 @@ begin
   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);
@@ -1211,6 +1254,14 @@ begin
   WhitelistCommand('g_warmup_time');
   WhitelistCommand('g_spawn_invul');
   WhitelistCommand('g_item_respawn_time');
+  WhitelistCommand('g_item_time_random');
+  WhitelistCommand('g_items_all_respawn_random');
+  WhitelistCommand('g_items_help_respawn_random');
+  WhitelistCommand('g_items_ammo_respawn_random');
+  WhitelistCommand('g_items_weapon_respawn_random');
+  WhitelistCommand('g_powerup_randomize_respawn');
+  WhitelistCommand('g_powerup_respawn_time');
+  WhitelistCommand('g_powerup_time_random');
 
   g_Console_ResetBinds;
   g_Console_ReadConfig(gConfigScript);
@@ -1223,12 +1274,24 @@ 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;
 begin
+{$IFDEF HEADLESS}
+  if ConsoleStdIn then
+    ReadStdIn();
+{$ENDIF}
+
   if Cons_Shown then
   begin
     Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
@@ -1934,10 +1997,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;
@@ -2040,7 +2106,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');
 
@@ -2174,20 +2240,30 @@ begin
   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, '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);
+  WriteLn(f, 'g_item_time_random ', gsItemRespawnRandom);
+  WriteLn(f, 'g_powerup_respawn_time ', gsRulezRespawnTime);
+  WriteLn(f, 'g_powerup_time_random ', gsRulezRespawnRandom);
   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_powerup_randomize_respawn ', GAME_OPTION_RULEZRANDOM);
+  WriteFlag('g_items_all_respawn_random ', GAME_OPTION_ITEMALLRANDOM);
+  WriteFlag('g_items_help_respawn_random ', GAME_OPTION_ITEMHELPRANDOM);
+  WriteFlag('g_items_ammo_respawn_random ', GAME_OPTION_ITEMAMMORANDOM);
+  WriteFlag('g_items_weapon_respawn_random ', GAME_OPTION_ITEMWEAPONRANDOM);
   WriteFlag('g_allow_exit ', GAME_OPTION_ALLOWEXIT);
   WriteFlag('g_allow_monsters ', GAME_OPTION_MONSTERS);
   WriteFlag('g_allow_dropflag ', GAME_OPTION_ALLOWDROPFLAG);
@@ -2205,9 +2281,10 @@ begin
     WriteLn(f, 'p1_model ', QuoteStr(Model));
     WriteLn(f, 'p1_team ', FormatTeam(Team));
     WriteLn(f, 'p1_autoswitch ', WeaponSwitch);
-    WriteLn(f, 'p1_priority_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET]));    
+    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_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]));    
@@ -2226,7 +2303,8 @@ begin
     WriteLn(f, 'p2_model ', QuoteStr(Model));
     WriteLn(f, 'p2_team ', FormatTeam(Team));
     WriteLn(f, 'p2_autoswitch ', WeaponSwitch);
-    WriteLn(f, 'p2_priority_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET]));    
+    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]));
@@ -2298,6 +2376,7 @@ begin
   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');
+  conRegVar('console_stdin', @ConsoleStdIn, 'enable reading commands from stdin', 'enable reading commands from stdin');
 {$IFDEF ANDROID}
   ChatTop := True;
   ConsoleHeight := 0.35;
@@ -2307,6 +2386,11 @@ begin
 {$ENDIF}
   ConsoleTrans := 0.1;
   ConsoleStep := 0.07;
+{$IFDEF HEADLESS}
+  ConsoleStdIn := True;
+{$ELSE}
+  ConsoleStdIn := False;
+{$ENDIF}
   conRegVar('d_eres', @debug_e_res, '', '');
   for i := 1 to e_MaxJoys do
     conRegVar('joy' + IntToStr(i) + '_deadzone', @e_JoystickDeadzones[i - 1], '', '')
@@ -2314,4 +2398,11 @@ end;
 
 initialization
   Init
+
+{$IFDEF HEADLESS}
+finalization
+  DoneKeyboard;
+  conbufStdOutRawMode := false;
+{$ENDIF}
+
 end.