diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 35778ef797dc9fbfa9897493209f7d2a00d2d4e8..53e8656b6ca39ccc2d027731b5e1e037a01afe6b 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
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('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_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('bot_removeall', GameCommands);
AddCommand('chat', GameCommands);
AddCommand('teamchat', GameCommands);
+ AddCommand('announce', GameCommands);
+ AddCommand('an', GameCommands);
AddCommand('game', GameCommands);
AddCommand('host', GameCommands);
AddCommand('map', GameCommands);
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;
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');
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);