diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index b564911086e54da4c1b0ad284666578146efd1e2..ccad27b86c8e700b0b8ecaa43ff0f4d00d7a44b3 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
uses
-{$IFDEF USE_NANOGL}
- nanoGL,
-{$ELSE}
- GL, GLExt,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+ g_holmes, fui_wadread, fui_style, fui_gfx_gl,
{$ENDIF}
SDL2, wadreader, e_log, g_window,
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_holmes, g_touch,
- utils, conbuf, envvars, fui_wadread, fui_style,
- fui_gfx_gl, xparser;
+ g_menu, g_language, g_net, g_touch,
+ utils, conbuf, envvars,
+ xparser;
var
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();
{$ENDIF}
{$ENDIF}
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
begin
IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
begin
- g_Console_Switch();
+ if not gChatShow then
+ g_Console_Switch()
end;
IK_ESCAPE, VK_ESCAPE: // <Esc>:
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