diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 12f33c6940fd05a7bff33ced7fb4bc58aff1d8d7..92c0ff5aa2a35d009fec83e43c69a688f6655cd5 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
- * 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
MapsDir: string;
ModelsDir: string;
GameWAD: string;
-
+ LogFileName: string;
implementation
uses
- SDL2, GL, GLExt, wadreader, e_log, g_window,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+ g_holmes, fui_wadread, fui_style, fui_gfx_gl,
+{$ENDIF}
+{$IFDEF USE_SDL2}
+ SDL2,
+{$ENDIF}
+ wadreader, e_log, g_window,
e_graphics, e_input, g_game, g_console, g_gui,
- e_sound, g_options, g_sound, g_player,
+ 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,
- utils, conbuf, envvars, fui_wadread, fui_style,
- fui_gfx_gl, xparser;
+ g_menu, g_language, g_net, g_touch, g_system, g_res_downloader,
+ utils, conbuf, envvars,
+ xparser;
var
procedure Main();
var
sdlflags: LongWord;
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded: Boolean;
{$ENDIF}
begin
ModelsDir := DataDir + 'models/';
GameWAD := DataDir + 'Game.wad';
- e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
+ e_InitLog(GameDir + '/' + LogFileName, TWriteMode.WM_NEWFILE);
- e_WriteLog('Read config file', TMsgType.Notify);
- g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+ e_WriteLog(
+ 'Doom 2D: Forever version ' + GAME_VERSION +
+ ' proto ' + IntToStr(NET_PROTOCOL_VER),
+ TMsgType.Notify
+ );
+ e_WriteLog(
+ 'Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME,
+ TMsgType.Notify
+ );
{$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 USE_SDL2}
{$IFDEF HEADLESS}
{$IFDEF USE_SDLMIXER}
sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
{$ENDIF}
{$ELSE}
{$IFDEF USE_SDLMIXER}
- sdlflags := SDL_INIT_EVERYTHING;
+ {*sdlflags := SDL_INIT_EVERYTHING;*}
+ sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
{$ELSE}
sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
{$ENDIF}
{$ENDIF}
+
+ SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0');
+
if SDL_Init(sdlflags) < 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
+{$ENDIF}
-{$IFNDEF HEADLESS}
- SDL_StartTextInput();
+ e_WriteLog('Init Input', TMsgType.Notify);
+ e_InitInput;
+
+ e_WriteLog('Read config file', TMsgType.Notify);
+ g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+ g_Console_SysInit;
+
+ //GetSystemDefaultLCID()
+
+ //e_WriteLog('Read language file', MSG_NOTIFY);
+ //g_Language_Load(DataDir + gLanguage + '.txt');
+ e_WriteLog(gLanguage, TMsgType.Notify);
+ g_Language_Set(gLanguage);
+
+{$IFNDEF USE_SDL2}
+ sys_Init;
{$ENDIF}
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
flexloaded := true;
if not fuiAddWad('flexui.wad') then
begin
g_holmes_imfunctional := not flexloaded;
{$ENDIF}
+ //g_Res_CreateDatabases(); // it will be done before connecting to the server for the first time
+
e_WriteLog('Entering SDLMain', TMsgType.Notify);
{$WARNINGS OFF}
SDLMain();
{$WARNINGS ON}
-{$IFNDEF HEADLESS}
- SDL_StopTextInput();
-{$ENDIF}
-
+{$IFDEF USE_SDL2}
e_WriteLog('Releasing SDL', TMsgType.Notify);
SDL_Quit();
+{$ELSE}
+ sys_Final;
+{$ENDIF}
end;
procedure Init();
NoSound := False;
{$ENDIF}
- e_WriteLog('Init Input', TMsgType.Notify);
- 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: // <`/~/¨/¸>:
- begin
- g_Console_Switch();
- end;
-
- IK_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