diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index c789caf7785c74a09a79e9e691f62b6277898551..c3741bc1ec0ab207be3c786a14513da0b4d397f8 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
MapsDir: string;
ModelsDir: string;
GameWAD: string;
-
+ LogFileName: string;
implementation
ModelsDir := DataDir + 'models/';
GameWAD := DataDir + 'Game.wad';
- e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
+ e_InitLog(GameDir + '/' + LogFileName, TWriteMode.WM_NEWFILE);
e_WriteLog(
'Doom 2D: Forever version ' + GAME_VERSION +
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;
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 (not gNoSound) then
begin
procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}
var
Msg: g_gui.TMessage;
+{$ENDIF}
begin
+{$IFNDEF HEADLESS}
case K of
- IK_PAUSE: // <Pause/Break>:
+ VK_ESCAPE: // <Esc>:
begin
- if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
- end;
-
- IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
- begin
- g_Console_Switch();
- end;
-
- IK_ESCAPE, 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
end;
end;
end;
+{$ENDIF}
end;
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
- g_Console_Char(C);
+ g_Console_Char(C)
end
else if (g_ActiveWindow <> nil) then
begin