diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 21616113c92c9571a8a44e6e088c6203c81552c9..fd7c36612ffca0daf6f7ad87daf7ba292502ae6c 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
procedure intVarHandler (me: PCommand; p: SSArray);
- procedure binaryFlag (var flag: Boolean; msg: AnsiString);
- begin
- if (Length(p) > 2) then
- begin
- conwritefln('too many arguments to ''%s''', [p[0]]);
- end
- else
- begin
- case conGetBoolArg(p, 1) of
- -1: begin end;
- 0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end;
- 1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end;
- 666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end;
- end;
- if (Length(msg) = 0) then msg := p[0] else msg += ':';
- if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]);
- end;
- end;
begin
if (Length(p) <> 2) then
begin
'hidekeyboard':
g_Touch_ShowKeyboard(False);
'togglemenu':
+ if gConsoleShow then
+ begin
+ g_Console_Switch;
+ menu_toggled := True
+ end
+ else
begin
- // this is HACK
KeyPress(VK_ESCAPE);
menu_toggled := True
end;
end;
'togglechat':
begin
- g_Console_Chat_Switch;
+ if not gConsoleShow and (g_ActiveWindow = nil) then
+ g_Console_Chat_Switch;
gSkipFirstChar := not g_Console_Interactive()
end;
'toggleteamchat':
if gGameSettings.GameMode in [GM_TDM, GM_CTF] then
begin
- g_Console_Chat_Switch(True);
+ if not gConsoleShow and (g_ActiveWindow = nil) then
+ g_Console_Chat_Switch(True);
gSkipFirstChar := not g_Console_Interactive()
end;
end
AddCommand('p2_name', GameCVars);
AddCommand('p1_color', GameCVars);
AddCommand('p2_color', GameCVars);
- AddCommand('r_showtime', GameCVars);
AddCommand('r_showscore', GameCVars);
AddCommand('r_showlives', GameCVars);
AddCommand('r_showstat', GameCVars);
if g_Console_MatchBind(K, 'togglemenu') then
begin
+ menu_toggled := True;
if gChatShow then
g_Console_Chat_Switch
else if gConsoleShow then
procedure g_Console_ProcessBind (key: Integer; down: Boolean);
var i: Integer;
begin
- if (not g_GUIGrabInput) and (not gChatShow) and (not gConsoleShow) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
+ if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then
begin
if down then
- for i := 0 to High(gInputBinds[key].down) do
- g_Console_Process(gInputBinds[key].down[i], True)
+ begin
+ if not gChatShow then
+ for i := 0 to High(gInputBinds[key].down) do
+ g_Console_Process(gInputBinds[key].down[i], True);
+ end
else
for i := 0 to High(gInputBinds[key].up) do
g_Console_Process(gInputBinds[key].up[i], True)
g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu');
end;
- // HACK: VK_ESCAPE always used as togglemenu, so don't touch it!
- // VK_CONSOLE
+ g_Console_BindKey(VK_ESCAPE, 'togglemenu');
g_Console_BindKey(VK_LSTRAFE, '+moveleft; +strafe', '-moveleft; -strafe');
g_Console_BindKey(VK_RSTRAFE, '+moveright; +strafe', '-moveright; -strafe');
g_Console_BindKey(VK_LEFT, '+moveleft', '-moveleft');