X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=53e8656b6ca39ccc2d027731b5e1e037a01afe6b;hb=6107d1bd653921f093e4d2c81f2905f4e520f6d4;hp=7ae8166192d7c16994c1855083076335fbf88d3a;hpb=06ce403977f0da3911c62eed46414ad03afa9111;p=d2df-sdl.git

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 7ae8166..53e8656 100644
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -1071,6 +1071,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);
@@ -1084,6 +1086,7 @@ 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);
@@ -1942,10 +1945,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;
@@ -2048,7 +2054,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');
 
@@ -2182,11 +2188,13 @@ 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);