diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 38fb35a5f5b8792903142ade3cfcfcd5e6df3fe3..02a46f2c4ab9cb90ae13a484b6b08ca7a590770f 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
g_profile_frame_update: Boolean = false;
g_profile_frame_draw: Boolean = false;
g_profile_collision: Boolean = false;
g_profile_frame_update: Boolean = false;
g_profile_frame_draw: Boolean = false;
g_profile_collision: Boolean = false;
+ g_profile_los: Boolean = false;
g_profile_history_size: Integer = 1000;
g_profile_history_size: Integer = 1000;
+
procedure g_ResetDynlights ();
procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
procedure g_ResetDynlights ();
procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
+
implementation
uses
implementation
uses
g_triggers, MAPDEF, g_monsters, e_sound, CONFIG,
BinEditor, g_language, g_net, SDL,
ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
g_triggers, MAPDEF, g_monsters, e_sound, CONFIG,
BinEditor, g_language, g_net, SDL,
ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
- utils, sfs;
+ utils, sfs, g_holmes;
// ////////////////////////////////////////////////////////////////////////// //
// ////////////////////////////////////////////////////////////////////////// //
if gPlayer2 <> nil then gPlayer2.GodMode := False;
if gPlayer1 <> nil then gPlayer1.NoTarget := False;
if gPlayer2 <> nil then gPlayer2.NoTarget := False;
if gPlayer2 <> nil then gPlayer2.GodMode := False;
if gPlayer1 <> nil then gPlayer1.NoTarget := False;
if gPlayer2 <> nil then gPlayer2.NoTarget := False;
+
+ {$IF DEFINED(D2F_DEBUG)}
+ if gPlayer1 <> nil then gPlayer1.NoTarget := True;
+ gAimLine := true;
+ {$ENDIF}
end;
procedure g_Game_ExecuteEvent(Name: String);
end;
procedure g_Game_ExecuteEvent(Name: String);
while (gDrawPanelList.count > 0) do
begin
pan := TPanel(gDrawPanelList.front());
while (gDrawPanelList.count > 0) do
begin
pan := TPanel(gDrawPanelList.front());
- e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.ArrIdx: %d', [tagmask, pan.tag, pan.ArrIdx]), MSG_NOTIFY);
+ e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.arrIdx: %d', [tagmask, pan.tag, pan.arrIdx]), MSG_NOTIFY);
pan.Draw();
gDrawPanelList.popFront();
end;
pan.Draw();
gDrawPanelList.popFront();
end;
if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X;
if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y;
if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X;
if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y;
- if gMapInfo.Width <= gPlayerScreenSize.X then a := 0;
- if gMapInfo.Height <= gPlayerScreenSize.Y then b := 0;
+ if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0
+ else if (gMapInfo.Width < gPlayerScreenSize.X) then
+ begin
+ // hcenter
+ a := (gPlayerScreenSize.X-gMapInfo.Width) div 2;
+ end;
+
+ if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0
+ else if (gMapInfo.Height < gPlayerScreenSize.Y) then
+ begin
+ // vcenter
+ b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2;
+ end;
if p.IncCam <> 0 then
begin
if p.IncCam <> 0 then
begin
//glTranslatef(a, b+p.IncCam, 0);
//glTranslatef(a, b+p.IncCam, 0);
+ p.viewPortX := sX;
+ p.viewPortY := sY;
+ p.viewPortW := sWidth;
+ p.viewPortH := sHeight;
+
+ if (p = gPlayer1) then
+ begin
+ g_Holmes_plrView(p.viewPortX, p.viewPortY, p.viewPortW, p.viewPortH);
+ end;
+
renderMapInternal(-c, -d, a, b+p.IncCam, true);
if p.FSpectator then
renderMapInternal(-c, -d, a, b+p.IncCam, true);
if p.FSpectator then
procedure drawProfilers ();
var
px: Integer = -1;
procedure drawProfilers ();
var
px: Integer = -1;
+ py: Integer = -1;
begin
begin
- if g_profile_frame_draw then px := px-drawProfiles(px, -1, profileFrameDraw);
- if g_profile_collision then px := px-drawProfiles(px, -1, profMapCollision);
+ if g_profile_frame_draw then px := px-drawProfiles(px, py, profileFrameDraw);
+ if g_profile_collision then begin px := px-drawProfiles(px, py, profMapCollision); py -= calcProfilesHeight(profMonsLOS); end;
+ if g_profile_los then begin px := px-drawProfiles(px, py, profMonsLOS); py -= calcProfilesHeight(profMonsLOS); end;
end;
procedure g_Game_Draw();
end;
procedure g_Game_Draw();
g_ActiveWindow.Draw();
end;
g_ActiveWindow.Draw();
end;
+ // draw inspector
+ if (g_holmes_enabled) then g_Holmes_Draw();
+
g_Console_Draw();
if g_debug_Sounds and gGameOn then
g_Console_Draw();
if g_debug_Sounds and gGameOn then
if (cmd = 'pf_draw_frame') then begin binaryFlag(g_profile_frame_draw, 'render profiles'); exit; end;
if (cmd = 'pf_update_frame') then begin binaryFlag(g_profile_frame_update, 'update profiles (not yet)'); exit; end;
if (cmd = 'pf_coldet') then begin binaryFlag(g_profile_collision, 'coldet profiles'); exit; end;
if (cmd = 'pf_draw_frame') then begin binaryFlag(g_profile_frame_draw, 'render profiles'); exit; end;
if (cmd = 'pf_update_frame') then begin binaryFlag(g_profile_frame_update, 'update profiles (not yet)'); exit; end;
if (cmd = 'pf_coldet') then begin binaryFlag(g_profile_collision, 'coldet profiles'); exit; end;
+ if (cmd = 'pf_los') then begin binaryFlag(g_profile_los, 'monster LOS profiles'); exit; end;
if (cmd = 'r_sq_draw') then begin binaryFlag(gdbg_map_use_accel_render, 'accelerated rendering'); exit; end;
if (cmd = 'cd_sq_enabled') then begin binaryFlag(gdbg_map_use_accel_coldet, 'accelerated map coldet'); exit; end;
if (cmd = 'mon_sq_enabled') then begin binaryFlag(gmon_debug_use_sqaccel, 'accelerated monster coldet'); exit; end;
if (cmd = 'r_sq_draw') then begin binaryFlag(gdbg_map_use_accel_render, 'accelerated rendering'); exit; end;
if (cmd = 'cd_sq_enabled') then begin binaryFlag(gdbg_map_use_accel_coldet, 'accelerated map coldet'); exit; end;
if (cmd = 'mon_sq_enabled') then begin binaryFlag(gmon_debug_use_sqaccel, 'accelerated monster coldet'); exit; end;
if (cmd = 'pr_enabled') then begin binaryFlag(gpart_dbg_enabled, 'particles'); exit; end;
if (cmd = 'pr_phys_enabled') then begin binaryFlag(gpart_dbg_phys_enabled, 'particle physics'); exit; end;
if (cmd = 'los_enabled') then begin binaryFlag(gmon_dbg_los_enabled, 'LOS calculations'); exit; end;
if (cmd = 'pr_enabled') then begin binaryFlag(gpart_dbg_enabled, 'particles'); exit; end;
if (cmd = 'pr_phys_enabled') then begin binaryFlag(gpart_dbg_phys_enabled, 'particle physics'); exit; end;
if (cmd = 'los_enabled') then begin binaryFlag(gmon_dbg_los_enabled, 'LOS calculations'); exit; end;
+
+ 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 (cmd = 'mon_think') then begin binaryFlag(gmon_debug_think, 'monster thinking'); exit; end;
+ if (cmd = 'dbg_holmes') then begin binaryFlag(g_holmes_enabled, 'Holmes'); exit; end;
end;
end;
begin
Parse_Params(pars);
begin
Parse_Params(pars);
- s := Find_Param_Value(pars, '--profile-render');
- if (s <> '') then g_profile_frame_draw := true;
-
- s := Find_Param_Value(pars, '--profile-coldet');
- if (s <> '') then g_profile_collision := true;
-
// Debug mode:
s := Find_Param_Value(pars, '--debug');
if (s <> '') then
// Debug mode:
s := Find_Param_Value(pars, '--debug');
if (s <> '') then