diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index bb914b69a94f862ae651197d616bdd88733fbebd..d1e15d1f55ec4cd84a08288df971a121e09a0dcc 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
procedure g_Game_StartVote(Command, Initiator: string);
procedure g_Game_CheckVote;
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_RENDER}
procedure g_TakeScreenShot(Filename: string = '');
{$ENDIF}
procedure g_FatalError(Text: String);
{$IFDEF ENABLE_MENU}
procedure g_Game_InGameMenu(Show: Boolean);
{$ENDIF}
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_SYSTEM}
procedure CharPress (C: AnsiChar);
{$ENDIF}
+
procedure KeyPress (K: Word);
{ procedure SetWinPause(Enable: Boolean); }
{$IFDEF ENABLE_SHELLS}
g_shells,
{$ENDIF}
- {$IFNDEF HEADLESS}
- r_render, g_system,
+ {$IFDEF ENABLE_CORPSES}
+ g_corpses,
+ {$ENDIF}
+ {$IFDEF ENABLE_RENDER}
+ r_render,
+ {$ENDIF}
+ {$IFDEF ENABLE_SYSTEM}
+ g_system,
{$ENDIF}
e_res, g_window,
e_input, e_log, g_console, g_items, g_map, g_panel,
end;
{$ENDIF}
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_SYSTEM}
procedure CharPress (C: AnsiChar);
{$IFDEF ENABLE_MENU}
var Msg: g_gui.TMessage;
g_Map_Free(freeTextures);
g_Player_Free();
- g_Player_RemoveAllCorpses();
+
+ {$IFDEF ENABLE_GIBS}
+ g_Gibs_RemoveAll;
+ {$ENDIF}
+ {$IFDEF ENALBE_SHELLS}
+ g_Shells_RemoveAll;
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ g_Corpses_RemoveAll;
+ {$ENDIF}
gGameSettings.GameType := GT_NONE;
if gGameSettings.GameMode = GM_SINGLE then
{$IFDEF ENABLE_GIBS}
g_Gibs_Update;
{$ENDIF}
- g_Player_UpdatePhysicalObjects();
+ {$IFDEF ENABLE_CORPSES}
+ g_Corpses_Update;
+ {$ENDIF}
{$IFDEF ENABLE_SHELLS}
g_Shells_Update;
{$ENDIF}
// Нужно сменить разрешение:
if gResolutionChange then
begin
- {$IFNDEF HEADLESS}
+ {$IFDEF ENABLE_RENDER}
e_WriteLog('Changing resolution', TMsgType.Notify);
r_Render_Apply;
{$ENDIF}
gMusic.Free();
g_Game_FreeData();
g_PlayerModel_FreeData();
-{$IFNDEF HEADLESS}
- //g_Menu_Free(); //k8: this segfaults after resolution change; who cares?
-{$ENDIF}
+ {$IFDEF ENABLE_MENU}
+ // g_Menu_Free(); //k8: this segfaults after resolution change; who cares?
+ {$ENDIF}
if NetInitDone then g_Net_Free;
gExit := EXIT_QUIT;
- {$IFNDEF HEADLESS}
+ {$IFDEF ENABLE_SYSTEM}
sys_RequestQuit;
{$ENDIF}
end;
nws: AnsiString;
begin
g_Map_Free((Map <> gCurrentMapFileName) and (oldMapPath <> gCurrentMapFileName));
- g_Player_RemoveAllCorpses();
+
+ {$IFDEF ENABLE_GIBS}
+ g_Gibs_RemoveAll;
+ {$ENDIF}
+ {$IFDEF ENALBE_SHELLS}
+ g_Shells_RemoveAll;
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ g_Corpses_RemoveAll;
+ {$ENDIF}
if (not g_Game_IsClient) and
(gSwitchGameMode <> gGameSettings.GameMode) and
begin
//result := g_Map_Load(gGameSettings.WAD + ':\' + ResName);
result := g_Map_Load(NewWAD+':\'+ResName);
- {$IFNDEF HEADLESS}
+ {$IFDEF ENABLE_RENDER}
r_Render_LoadTextures;
{$ENDIF}
end;
Exit;
end;
- g_Player_RemoveAllCorpses;
+ {$IFDEF ENABLE_GIBS}
+ g_Gibs_RemoveAll;
+ {$ENDIF}
+ {$IFDEF ENALBE_SHELLS}
+ g_Shells_RemoveAll;
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ g_Corpses_RemoveAll;
+ {$ENDIF}
+
g_Game_Message(_lc[I_MESSAGE_LMS_START], 144);
if g_Game_IsNet then
MH_SEND_GameEvent(NET_EV_LMS_START);
begin
if Length(p) = 2 then
begin
- a := Max(0, StrToIntDef(p[1], 0));
- g_Corpses_SetMax(a)
+ {$IFDEF ENABLE_CORPSES}
+ a := Max(0, StrToIntDef(p[1], 0));
+ g_Corpses_SetMax(a)
+ {$ENDIF}
end
else if Length(p) = 1 then
begin
- e_LogWritefln('%s', [g_Corpses_GetMax()])
+ {$IFDEF ENABLE_CORPSES}
+ e_LogWritefln('%s', [g_Corpses_GetMax()])
+ {$ELSE}
+ e_LogWritefln('%s', [0])
+ {$ENDIF}
end
else
begin
end
else if cmd = 'screenshot' then
begin
- {$IFNDEF HEADLESS}
- g_TakeScreenShot()
+ {$IFDEF ENABLE_RENDER}
+ g_TakeScreenShot;
{$ENDIF}
end
else if (cmd = 'weapnext') or (cmd = 'weapprev') then
g_Game_Free();
g_Game_Quit();
end;
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_RENDER}
'r_reset':
r_Render_Apply;
{$ENDIF}
end;
end;
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_RENDER}
procedure g_TakeScreenShot(Filename: string = '');
var t: TDateTime; dir, date, name: String;
begin