diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 5daed9b341abb7e029f41863d229117e35b1d23b..5ea72be400acb2a56f9809a70217175121492ddc 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
MapsDir: string;
ModelsDir: string;
GameWAD: string;
MapsDir: string;
ModelsDir: string;
GameWAD: string;
- gSkipFirstChar: Boolean; (* hack for console/chat input *)
+ LogFileName: string;
implementation
implementation
e_graphics, e_input, g_game, g_console, g_gui,
e_sound, g_options, g_sound, g_player, g_basic,
g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
e_graphics, e_input, g_game, g_console, g_gui,
e_sound, g_options, g_sound, g_player, g_basic,
g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
- g_menu, g_language, g_net, g_touch,
+ g_menu, g_language, g_net, g_touch, g_res_downloader,
utils, conbuf, envvars,
xparser;
utils, conbuf, envvars,
xparser;
ModelsDir := DataDir + 'models/';
GameWAD := DataDir + 'Game.wad';
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(
'Doom 2D: Forever version ' + GAME_VERSION +
e_WriteLog(gLanguage, TMsgType.Notify);
g_Language_Set(gLanguage);
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
{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
g_holmes_imfunctional := not flexloaded;
{$ENDIF}
g_holmes_imfunctional := not flexloaded;
{$ENDIF}
+ g_Res_CreateDatabases();
+
e_WriteLog('Entering SDLMain', TMsgType.Notify);
{$WARNINGS OFF}
SDLMain();
{$WARNINGS ON}
e_WriteLog('Entering SDLMain', TMsgType.Notify);
{$WARNINGS OFF}
SDLMain();
{$WARNINGS ON}
-{$IFNDEF HEADLESS}
- SDL_StopTextInput();
-{$ENDIF}
-
e_WriteLog('Releasing SDL', TMsgType.Notify);
SDL_Quit();
end;
e_WriteLog('Releasing SDL', TMsgType.Notify);
SDL_Quit();
end;
procedure KeyPress (K: Word);
procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}
var
Msg: g_gui.TMessage;
var
Msg: g_gui.TMessage;
+{$ENDIF}
begin
begin
+{$IFNDEF HEADLESS}
case K of
case K of
- IK_PAUSE: // <Pause/Break>:
- begin
- if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
- end;
-
- IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
+ VK_ESCAPE: // <Esc>:
begin
begin
- if not gChatShow then
- g_Console_Switch()
- end;
-
- IK_ESCAPE, VK_ESCAPE, JOY0_JUMP, JOY1_JUMP, JOY2_JUMP, JOY3_JUMP: // <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;
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
end;
end;
end;
end;
end;
end;
+{$ENDIF}
end;
end;
Msg: g_gui.TMessage;
a: Integer;
begin
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
if gConsoleShow or gChatShow then
begin
- g_Console_Char(C);
+ g_Console_Char(C)
end
else if (g_ActiveWindow <> nil) then
begin
end
else if (g_ActiveWindow <> nil) then
begin