X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=b5595832e9573dd1fd2242dbbf32af4085fce7ff;hb=f4de88f1f4384cc3c798bccc695d92ad3781eb7b;hp=23113e77f629fd2b426ddc783bc1c31f0b30a33f;hpb=4de34c0c003869d8f125768be330702020f3c514;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 23113e7..b559583 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -32,7 +32,6 @@ var MapsDir: string; ModelsDir: string; GameWAD: string; - gSkipFirstChar: Boolean; (* hack for console/chat input *) implementation @@ -117,12 +116,6 @@ begin 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 @@ -174,10 +167,6 @@ begin SDLMain(); {$WARNINGS ON} -{$IFNDEF HEADLESS} - SDL_StopTextInput(); -{$ENDIF} - e_WriteLog('Releasing SDL', TMsgType.Notify); SDL_Quit(); end; @@ -491,38 +480,9 @@ var Msg: g_gui.TMessage; begin case K of - IK_PAUSE: // : - 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: // : - begin - if gChatShow then - g_Console_Chat_Switch - else if gConsoleShow then - g_Console_Switch - end; - VK_ESCAPE: // : 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 := VK_ESCAPE; @@ -599,17 +559,9 @@ var 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