diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 5daed9b341abb7e029f41863d229117e35b1d23b..b5595832e9573dd1fd2242dbbf32af4085fce7ff 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
MapsDir: string;
ModelsDir: string;
GameWAD: string;
- gSkipFirstChar: Boolean; (* hack for console/chat input *)
implementation
e_WriteLog(gLanguage, TMsgType.Notify);
g_Language_Set(gLanguage);
-{$IFNDEF HEADLESS}
-{$IFNDEF ANDROID}
- SDL_StartTextInput();
-{$ENDIF}
-{$ENDIF}
-
{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
SDLMain();
{$WARNINGS ON}
-{$IFNDEF HEADLESS}
- SDL_StopTextInput();
-{$ENDIF}
-
e_WriteLog('Releasing SDL', TMsgType.Notify);
SDL_Quit();
end;
Msg: g_gui.TMessage;
begin
case K of
- IK_PAUSE: // <Pause/Break>:
- begin
- if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
- end;
-
- IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
- begin
- if not gChatShow then
- g_Console_Switch()
- end;
-
- IK_ESCAPE, VK_ESCAPE, JOY0_JUMP, JOY1_JUMP, JOY2_JUMP, JOY3_JUMP: // <Esc>:
+ VK_ESCAPE: // <Esc>:
begin
- if gChatShow then
- begin
- g_Console_Chat_Switch();
- Exit;
- end;
-
- if gConsoleShow then
- begin
- g_Console_Switch();
- end
- else if (g_ActiveWindow <> nil) then
+ 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
Msg: g_gui.TMessage;
a: Integer;
begin
- if gSkipFirstChar then
- begin
- gSkipFirstChar := False;
- Exit
- end;
-
- if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then Exit;
-
if gConsoleShow or gChatShow then
begin
- g_Console_Char(C);
+ g_Console_Char(C)
end
else if (g_ActiveWindow <> nil) then
begin