diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 7864bedebfd18c005a89a1e1c7003f51d39cb3d2..4e10356760d4b2e00a0e23d08083328120139343 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
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,
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,
+ g_menu, g_language, g_net,
utils, conbuf, envvars;
var
utils, conbuf, envvars;
var
ModelsDir := DataDir + 'models/';
GameWAD := DataDir + 'Game.wad';
ModelsDir := DataDir + 'models/';
GameWAD := DataDir + 'Game.wad';
- e_InitLog(GameDir + '/' + LOG_FILENAME, WM_NEWFILE);
+ e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
- e_WriteLog('Read config file', MSG_NOTIFY);
+ e_WriteLog('Read config file', TMsgType.Notify);
g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
{$IFDEF HEADLESS}
g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
{$IFDEF HEADLESS}
//e_WriteLog('Read language file', MSG_NOTIFY);
//g_Language_Load(DataDir + gLanguage + '.txt');
//e_WriteLog('Read language file', MSG_NOTIFY);
//g_Language_Load(DataDir + gLanguage + '.txt');
- e_WriteLog(gLanguage, MSG_NOTIFY);
+ e_WriteLog(gLanguage, TMsgType.Notify);
g_Language_Set(gLanguage);
{$IFDEF HEADLESS}
g_Language_Set(gLanguage);
{$IFDEF HEADLESS}
SDL_StartTextInput();
{$ENDIF}
SDL_StartTextInput();
{$ENDIF}
- e_WriteLog('Entering SDLMain', MSG_NOTIFY);
+ e_WriteLog('Entering SDLMain', TMsgType.Notify);
{$WARNINGS OFF}
SDLMain();
{$WARNINGS OFF}
SDLMain();
SDL_StopTextInput();
{$ENDIF}
SDL_StopTextInput();
{$ENDIF}
- e_WriteLog('Releasing SDL', MSG_NOTIFY);
+ e_WriteLog('Releasing SDL', TMsgType.Notify);
SDL_Quit();
end;
SDL_Quit();
end;
NoSound := False;
{$ENDIF}
NoSound := False;
{$ENDIF}
- e_WriteLog('Init Input', MSG_NOTIFY);
+ e_WriteLog('Init Input', TMsgType.Notify);
e_InitInput();
if (e_JoysticksAvailable > 0) then
e_InitInput();
if (e_JoysticksAvailable > 0) then
- e_WriteLog('Input: Joysticks available.', MSG_NOTIFY)
+ e_WriteLog('Input: Joysticks available.', TMsgType.Notify)
else
else
- e_WriteLog('Input: No Joysticks.', MSG_NOTIFY);
+ e_WriteLog('Input: No Joysticks.', TMsgType.Notify);
if (not gNoSound) then
begin
if (not gNoSound) then
begin
- e_WriteLog('Initializing sound system', MSG_NOTIFY);
+ e_WriteLog('Initializing sound system', TMsgType.Notify);
e_InitSoundSystem(NoSound);
end;
e_InitSoundSystem(NoSound);
end;
- e_WriteLog('Init game', MSG_NOTIFY);
+ e_WriteLog('Init game', TMsgType.Notify);
g_Game_Init();
for a := 0 to 15 do charbuff[a] := ' ';
g_Game_Init();
for a := 0 to 15 do charbuff[a] := ' ';
procedure Release();
begin
procedure Release();
begin
- e_WriteLog('Releasing engine', MSG_NOTIFY);
+ e_WriteLog('Releasing engine', TMsgType.Notify);
e_ReleaseEngine();
e_ReleaseEngine();
- e_WriteLog('Releasing Input', MSG_NOTIFY);
+ e_WriteLog('Releasing Input', TMsgType.Notify);
e_ReleaseInput();
if not gNoSound then
begin
e_ReleaseInput();
if not gNoSound then
begin
- e_WriteLog('Releasing FMOD', MSG_NOTIFY);
+ e_WriteLog('Releasing FMOD', TMsgType.Notify);
e_ReleaseSoundSystem();
end;
end;
e_ReleaseSoundSystem();
end;
end;
Cheated;
var
s, s2: string;
Cheated;
var
s, s2: string;
- c: Char16;
+ c: ShortString;
a: Integer;
begin
a: Integer;
begin
+ {
if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and
(gGameSettings.GameMode <> GM_COOP) and (not gDebugMode))
or g_Game_IsNet then Exit;
if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and
(gGameSettings.GameMode <> GM_COOP) and (not gDebugMode))
or g_Game_IsNet then Exit;
+ }
+ if not gGameOn then exit;
+ if not conIsCheatsEnabled then exit;
s := 'SOUND_GAME_RADIO';
s := 'SOUND_GAME_RADIO';
if gTriggers[a].TriggerType = TRIGGER_EXIT then
begin
gExitByTrigger := True;
if gTriggers[a].TriggerType = TRIGGER_EXIT then
begin
gExitByTrigger := True;
- g_Game_ExitLevel(gTriggers[a].Data.MapName);
+ //g_Game_ExitLevel(gTriggers[a].Data.MapName);
+ g_Game_ExitLevel(gTriggers[a].tgcMap);
Break;
end;
goto Cheated;
Break;
end;
goto Cheated;