diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index c789caf7785c74a09a79e9e691f62b6277898551..df6bba16a9b77160b30f6af2a3be2c61e0f8eae7 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
MapsDir: string;
ModelsDir: string;
GameWAD: string;
MapsDir: string;
ModelsDir: string;
GameWAD: string;
-
+ gSkipFirstChar: Boolean; (* hack for console/chat input *)
implementation
implementation
e_InitInput();
g_Touch_Init;
e_InitInput();
g_Touch_Init;
+(*
if (e_JoysticksAvailable > 0) then
e_WriteLog('Input: Joysticks available.', TMsgType.Notify)
else
e_WriteLog('Input: No Joysticks.', TMsgType.Notify);
if (e_JoysticksAvailable > 0) then
e_WriteLog('Input: Joysticks available.', TMsgType.Notify)
else
e_WriteLog('Input: No Joysticks.', TMsgType.Notify);
+*)
if (not gNoSound) then
begin
if (not gNoSound) then
begin
IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
begin
IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
begin
- g_Console_Switch();
+ if not gChatShow then
+ g_Console_Switch()
end;
end;
- IK_ESCAPE, VK_ESCAPE: // <Esc>:
+ IK_ESCAPE: // <Esc>:
+ begin
+ if gChatShow then
+ g_Console_Chat_Switch
+ else if gConsoleShow then
+ g_Console_Switch
+ end;
+
+ VK_ESCAPE: // <Esc>:
begin
if gChatShow then
begin
begin
if gChatShow then
begin
else if (g_ActiveWindow <> nil) then
begin
Msg.Msg := WM_KEYDOWN;
else if (g_ActiveWindow <> nil) then
begin
Msg.Msg := WM_KEYDOWN;
- Msg.WParam := IK_ESCAPE;
+ Msg.WParam := VK_ESCAPE;
g_ActiveWindow.OnMessage(Msg);
if (not g_Game_IsNet) and (g_ActiveWindow = nil) then g_Game_Pause(false); //Fn loves to do this
end
g_ActiveWindow.OnMessage(Msg);
if (not g_Game_IsNet) and (g_ActiveWindow = nil) then g_Game_Pause(false); //Fn loves to do this
end
Msg: g_gui.TMessage;
a: Integer;
begin
Msg: g_gui.TMessage;
a: Integer;
begin
- if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then Exit;
-
if gConsoleShow or gChatShow then
begin
if gConsoleShow or gChatShow then
begin
- g_Console_Char(C);
+ if gSkipFirstChar then
+ gSkipFirstChar := False
+ else
+ g_Console_Char(C)
end
else if (g_ActiveWindow <> nil) then
begin
end
else if (g_ActiveWindow <> nil) then
begin