diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index c15aeaae6fa4750e39c3169fe78ad73f98129958..ce8c5787d770a68a1ca9adcf66b60b62931abb18 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); }
gPlayer2Settings: TPlayerSettings;
gGameOn: Boolean;
gPlayerScreenSize: TDFPoint;
- gPlayer1ScreenCoord: TDFPoint;
- gPlayer2ScreenCoord: TDFPoint;
gPlayer1: TPlayer = nil;
gPlayer2: TPlayer = nil;
- gPlayerDrawn: TPlayer = nil;
gTime: LongWord;
gLerpFactor: Single = 1.0;
gSwitchGameMode: Byte = GM_DM;
gHearPoint1, gHearPoint2: THearPoint;
+ gMaxDist: Integer = 1; // for sound
gSoundEffectsDF: Boolean = False;
gSoundTriggerTime: Word = 0;
gAnnouncer: Integer = ANNOUNCE_NONE;
{$IFDEF ENABLE_MENU}
g_menu,
{$ENDIF}
- {$IFNDEF HEADLESS}
- r_render, g_system,
+ {$IFDEF ENABLE_GFX}
+ g_gfx,
+ {$ENDIF}
+ {$IFDEF ENABLE_GIBS}
+ g_gibs,
+ {$ENDIF}
+ {$IFDEF ENABLE_SHELLS}
+ g_shells,
+ {$ENDIF}
+ {$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,
- g_playermodel, g_gfx, g_options, Math,
+ g_playermodel, g_options, Math,
g_triggers, g_monsters, e_sound, CONFIG,
g_language, g_net, g_phys,
ENet, e_msg, g_netmsg, g_netmaster,
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
g_Weapon_PreUpdate();
end;
+ procedure g_Game_SetupHearPoints;
+ var p1, p2: TPlayer; a, b: Integer;
+ begin
+ p1 := nil;
+ p2 := nil;
+ gHearPoint1.Active := false;
+ gHearPoint2.Active := false;
+ if gSpectMode = SPECT_MAPVIEW then
+ begin
+ // TODO something better (render dependency)
+ gHearPoint1.Active := true;
+ gHearPoint1.Coords.X := gSpectX + gScreenWidth div 2;
+ gHearPoint1.Coords.Y := gSpectY + gScreenHeight div 2;
+ end
+ else if gSpectMode = SPECT_PLAYERS then
+ begin
+ p1 := g_Player_Get(gSpectPID1);
+ if gSpectViewTwo then
+ p2 := g_Player_Get(gSpectPID2);
+ end
+ else if gSpectMode = SPECT_NONE then
+ begin
+ p1 := gPlayer1;
+ p2 := gPlayer2;
+ end;
+ if p1 <> nil then
+ begin
+ gHearPoint1.Active := true;
+ gHearPoint1.Coords.X := p1.obj.x + p1.obj.rect.width div 2;
+ gHearPoint1.Coords.Y := p1.obj.y + p1.obj.rect.height div 2;
+ end;
+ if (p2 <> nil) and (p1 <> p2) then
+ begin
+ gHearPoint2.Active := true;
+ gHearPoint2.Coords.X := p2.obj.x + p2.obj.rect.width div 2;
+ gHearPoint2.Coords.Y := p2.obj.y + p2.obj.rect.height div 2;
+ end;
+ // TODO something better (render dependency)
+ if (p1 <> nil) and (p2 <> nil) then
+ begin
+ gPlayerScreenSize.X := gScreenWidth - 196;
+ gPlayerScreenSize.Y := gScreenHeight div 2;
+ end
+ else
+ begin
+ gPlayerScreenSize.X := gScreenWidth - 196;
+ gPlayerScreenSize.Y := gScreenHeight;
+ end;
+ // sound distance
+ if gMapInfo.Height > gPlayerScreenSize.Y then a := gMapInfo.Height - gPlayerScreenSize.Y else a := gMapInfo.Height;
+ if gMapInfo.Width > gPlayerScreenSize.X then b := gMapInfo.Width - gPlayerScreenSize.X else b := gMapInfo.Width;
+ gMaxDist := Trunc(Hypot(a, b));
+ end;
+
procedure g_Game_Update();
var
{$IFDEF ENABLE_MENU}
// Статистика по Tab:
if gGameOn then
+ begin
IsDrawStat := (not gConsoleShow) and (not gChatShow) and (gGameSettings.GameType <> GT_SINGLE) and g_Console_Action(ACTION_SCORES);
+ end
+ else
+ begin
+ if g_Console_Action(ACTION_SCORES) then
+ begin
+ if not gStatsPressed then
+ begin
+ gStatsOff := not gStatsOff;
+ gStatsPressed := True;
+ end;
+ end
+ else
+ gStatsPressed := False;
+ end;
// Игра идет:
if gGameOn and not gPause and (gState <> STATE_FOLD) then
end;
end;
+ (* spectator state check from render *)
+
+ if (gPlayer1 = nil) and (gPlayer2 = nil) and (gSpectMode = SPECT_NONE) then
+ gSpectMode := SPECT_STATS;
+
+ if IsActivePlayer(g_Player_Get(gSpectPID1)) = false then
+ gSpectPID1 := GetActivePlayerID_Next();
+
+ if IsActivePlayer(g_Player_Get(gSpectPID2)) = false then
+ gSpectPID2 := GetActivePlayerID_Next();
+
+ g_Game_SetupHearPoints;
+
// Обновляем все остальное:
g_Map_Update();
g_Items_Update();
g_Triggers_Update();
g_Weapon_Update();
g_Monsters_Update();
- g_GFX_Update();
+ {$IFDEF ENABLE_GFX}
+ g_GFX_Update;
+ {$ENDIF}
g_Player_UpdateAll();
- g_Player_UpdatePhysicalObjects();
+ {$IFDEF ENABLE_GIBS}
+ g_Gibs_Update;
+ {$ENDIF}
+ {$IFDEF ENABLE_CORPSES}
+ g_Corpses_Update;
+ {$ENDIF}
+ {$IFDEF ENABLE_SHELLS}
+ g_Shells_Update;
+ {$ENDIF}
// server: send newly spawned monsters unconditionally
if (gGameSettings.GameType = GT_SERVER) then
// Нужно сменить разрешение:
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_GFX_SetMax(a)
+ {$IFDEF ENABLE_GFX}
+ a := Max(0, StrToIntDef(p[1], 0));
+ g_GFX_SetMax(a)
+ {$ENDIF}
end
else if Length(p) = 1 then
begin
- e_LogWritefln('%s', [g_GFX_GetMax()])
+ {$IFDEF ENABLE_GFX}
+ e_LogWritefln('%s', [g_GFX_GetMax()])
+ {$ELSE}
+ e_LogWritefln('%s', [0])
+ {$ENDIF}
end
else
begin
begin
if Length(p) = 2 then
begin
- a := Max(0, StrToIntDef(p[1], 0));
- g_Shells_SetMax(a)
+ {$IFDEF ENABLE_SHELLS}
+ a := Max(0, StrToIntDef(p[1], 0));
+ g_Shells_SetMax(a)
+ {$ENDIF}
end
else if Length(p) = 1 then
begin
- e_LogWritefln('%s', [g_Shells_GetMax()])
+ {$IFDEF ENABLE_SHELLS}
+ e_LogWritefln('%s', [g_Shells_GetMax()])
+ {$ELSE}
+ e_LogWritefln('%s', [0])
+ {$ENDIF}
end
else
begin
begin
if Length(p) = 2 then
begin
- a := Max(0, StrToIntDef(p[1], 0));
- g_Gibs_SetMax(a)
+ {$IFDEF ENABLE_GIBS}
+ a := Max(0, StrToIntDef(p[1], 0));
+ g_Gibs_SetMax(a)
+ {$ENDIF}
end
else if Length(p) = 1 then
begin
- e_LogWritefln('%s', [g_Gibs_GetMax()])
+ {$IFDEF ENABLE_GIBS}
+ e_LogWritefln('%s', [g_Gibs_GetMax()])
+ {$ELSE}
+ e_LogWritefln('%s', [0])
+ {$ENDIF}
end
else
begin
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
conRegVar('mon_sq_enabled', @gmon_debug_use_sqaccel, 'accelerated spatial queries for monsters', 'accelerated monster coldet');
conRegVar('wtrace_sq_enabled', @gwep_debug_fast_trace, 'accelerated spatial queries for weapon hitscan trace', 'accelerated weapon hitscan');
+{$IFDEF ENABLE_GFX}
conRegVar('pr_enabled', @gpart_dbg_enabled, 'enable/disable particles', 'particles');
conRegVar('pr_phys_enabled', @gpart_dbg_phys_enabled, 'enable/disable particle physics', 'particle physics');
+{$ENDIF}
conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true);
conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true);