Game: Save 'scores' instead of 'p1_scores' to the options file

[d2df-sdl.git] / src / game / g_console.pas

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 8c0c41e0e22cb6282cb669e07e665a214f03a065..7f1d7b2aab0894b1e8527e1d20e6a106c652bd90 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -1037,9 +1037,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);
@@ -1080,6 +1084,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);
@@ -1105,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);
@@ -1146,10 +1153,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);
@@ -1934,10 +1943,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 +2052,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');
 
@@ -2178,7 +2190,7 @@ begin
 
   // 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);
@@ -2205,9 +2217,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 +2239,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]));