diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 34de5cf99b8397a677492d5bcec19060bf434b7b..5daed9b341abb7e029f41863d229117e35b1d23b 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
procedure Main();
var
sdlflags: LongWord;
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded: Boolean;
{$ENDIF}
begin
TMsgType.Notify
);
- e_WriteLog('Read config file', TMsgType.Notify);
- g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
-
{$IFDEF HEADLESS}
conbufDumpToStdOut := true;
{$ENDIF}
e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
- //GetSystemDefaultLCID()
-
- //e_WriteLog('Read language file', MSG_NOTIFY);
- //g_Language_Load(DataDir + gLanguage + '.txt');
- e_WriteLog(gLanguage, TMsgType.Notify);
- g_Language_Set(gLanguage);
-
{$IFDEF HEADLESS}
{$IFDEF USE_SDLMIXER}
sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
if SDL_Init(sdlflags) < 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
+ e_WriteLog('Read config file', TMsgType.Notify);
+ g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+
+ //GetSystemDefaultLCID()
+
+ //e_WriteLog('Read language file', MSG_NOTIFY);
+ //g_Language_Load(DataDir + gLanguage + '.txt');
+ e_WriteLog(gLanguage, TMsgType.Notify);
+ g_Language_Set(gLanguage);
+
{$IFNDEF HEADLESS}
{$IFNDEF ANDROID}
SDL_StartTextInput();
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
IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
begin
- g_Console_Switch();
+ if not gChatShow then
+ g_Console_Switch()
end;
- IK_ESCAPE, VK_ESCAPE: // <Esc>:
+ IK_ESCAPE, VK_ESCAPE, JOY0_JUMP, JOY1_JUMP, JOY2_JUMP, JOY3_JUMP: // <Esc>:
begin
if gChatShow then
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