diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 1840635b1ce51b070fb950c573b8db8093fe7d8e..48f0bb5648c73f18825364e46b4e8b93c99bf4bf 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
implementation
uses
- SDL2, GL, GLExt, WADEDITOR, e_log, g_window,
+ SDL2, GL, GLExt, wadreader, e_log, g_window,
e_graphics, e_input, g_game, g_console, g_gui,
e_sound, g_options, g_sound, g_player,
g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
- MAPSTRUCT, g_menu, g_language, g_net, sfs;
+ MAPSTRUCT, g_menu, g_language, g_net, utils;
var
charbuff: Array [0..15] of Char;
procedure Main();
+var
+ sdlflags: LongWord;
begin
GetDir(0, GameDir);
MapsDir := GameDir + '/maps/';
e_WriteLog('Read config file', MSG_NOTIFY);
g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+
+ e_WriteToStdOut := {$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
//GetSystemDefaultLCID()
//g_Language_Load(DataDir + gLanguage + '.txt');
e_WriteLog(gLanguage, MSG_NOTIFY);
g_Language_Set(gLanguage);
-
-{$IFDEF USE_SDLMIXER}
- if SDL_Init({SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO or SDL_INIT_AUDIO}SDL_INIT_EVERYTHING) < 0 then
+
+{$IFDEF HEADLESS}
+ sdlflags := SDL_INIT_TIMER or $00004000;
{$ELSE}
- if SDL_Init(SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO) < 0 then
+ {$IFDEF USE_SDLMIXER}
+ sdlflags := SDL_INIT_EVERYTHING;
+ {$ELSE}
+ sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
+ {$ENDIF}
{$ENDIF}
+ if SDL_Init(sdlflags) < 0 then
raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
-
+
+{$IFDEF HEADLESS}
SDL_StartTextInput();
+{$ENDIF}
e_WriteLog('Entering SDLMain', MSG_NOTIFY);
- {$WARNINGS OFF}
+{$WARNINGS OFF}
SDLMain();
- {$WARNINGS ON}
+{$WARNINGS ON}
+{$IFDEF HEADLESS}
SDL_StopTextInput();
+{$ENDIF}
e_WriteLog('Releasing SDL', MSG_NOTIFY);
SDL_Quit();
else
e_WriteLog('Input: No Joysticks.', MSG_NOTIFY);
- if not gNoSound then
+ if (not gNoSound) then
begin
e_WriteLog('Initializing sound system', MSG_NOTIFY);
- e_InitSoundSystem();
+ e_InitSoundSystem({$IFDEF HEADLESS}True{$ELSE}False{$ENDIF});
end;
e_WriteLog('Init game', MSG_NOTIFY);
else
begin
for a := 0 to 14 do charbuff[a] := charbuff[a+1];
- charbuff[15] := SFSUpCase(C);
+ charbuff[15] := UpCase1251(C);
Cheat();
end;
end;