diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index b5a22840fbda68d7b604cb420dd1e351f07f0fb2..960eb9eeafaccd3325d119a7a042c03b5cfd796f 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* 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
implementation
uses
- SDL2, GL, GLExt, wadreader, e_log, g_window,
+{$IFDEF USE_NANOGL}
+ nanoGL,
+{$ELSE}
+ GL, GLExt,
+{$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,
+ 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,
e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
+ 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
+ );
+
e_WriteLog('Read config file', TMsgType.Notify);
g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
{$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());
{$IFNDEF HEADLESS}
+{$IFNDEF ANDROID}
SDL_StartTextInput();
{$ENDIF}
+{$ENDIF}
{$IFNDEF HEADLESS}
flexloaded := true;
begin
if g_Map_Exist(MapsDir+gGameSettings.WAD+':\MAP'+s2) then
begin
- c := 'MAP00';
- c[3] := s2[1];
- c[4] := s2[2];
+ c := 'MAP'+s2;
g_Game_ExitLevel(c);
end;
goto Cheated;
if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
end;
- IK_BACKQUOTE: // <`/~/¨/¸>:
+ IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
begin
g_Console_Switch();
end;
- IK_ESCAPE: // <Esc>:
+ IK_ESCAPE, VK_ESCAPE: // <Esc>:
begin
if gChatShow then
begin