diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index fb5d978bc793a5152d9648cde712bb3a75de5d7a..99e1a3d8ce26a22509465542a792278615d3ce9a 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_los: Boolean = false;
g_profile_history_size: Integer = 1000;
+ postdrawMouse: procedure = nil;
+
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);
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);
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;
//glTranslatef(a, b+p.IncCam, 0);
+ p.viewPortX := sX;
+ p.viewPortY := sY;
+ p.viewPortW := sWidth;
+ p.viewPortH := sHeight;
+
renderMapInternal(-c, -d, a, b+p.IncCam, true);
if p.FSpectator then
procedure drawProfilers ();
var
px: Integer = -1;
+ py: Integer = -1;
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();
Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]),
gStdFont);
+ if gGameOn and assigned(postdrawMouse) then postdrawMouse();
+
if gGameOn then drawProfilers();
end;
end;
procedure g_Game_SetupScreenSize();
+const
+ RES_FACTOR = 4.0 / 3.0;
var
- d: Single;
+ s: Single;
+ rf: Single;
+ bw, bh: Word;
begin
// Ðàçìåð ýêðàíîâ èãðîêîâ:
gPlayerScreenSize.X := gScreenWidth-196;
// Ðàçìåð çàäíåãî ïëàíà:
if BackID <> DWORD(-1) then
begin
- d := SKY_STRETCH;
-
- if (gScreenWidth*d > gMapInfo.Width) or
- (gScreenHeight*d > gMapInfo.Height) then
- d := 1.0;
-
- gBackSize.X := Round(gScreenWidth*d);
- gBackSize.Y := Round(gScreenHeight*d);
+ s := SKY_STRETCH;
+ if (gScreenWidth*s > gMapInfo.Width) or
+ (gScreenHeight*s > gMapInfo.Height) then
+ begin
+ gBackSize.X := gScreenWidth;
+ gBackSize.Y := gScreenHeight;
+ end
+ else
+ begin
+ e_GetTextureSize(BackID, @bw, @bh);
+ rf := Single(bw) / Single(bh);
+ if (rf > RES_FACTOR) then bw := Round(Single(bh) * RES_FACTOR)
+ else if (rf < RES_FACTOR) then bh := Round(Single(bw) / RES_FACTOR);
+ s := Max(gScreenWidth / bw, gScreenHeight / bh);
+ if (s < 1.0) then s := 1.0;
+ gBackSize.X := Round(bw*s);
+ gBackSize.Y := Round(bh*s);
+ end;
end;
end;
if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
end;
-begin
- //if not gDebugMode then exit;
- cmd := LowerCase(P[0]);
-
- if cmd = 'pf_draw_frame' then
- begin
- g_profile_frame_draw := not g_profile_frame_draw;
- exit;
- end;
-
- if cmd = 'pf_update_frame' then
- begin
- g_profile_frame_update := not g_profile_frame_update;
- exit;
- end;
-
- if cmd = 'pf_coldet' then
- begin
- g_profile_collision := not g_profile_collision;
- exit;
- end;
-
- if cmd = 'r_sq_draw' then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gdbg_map_use_accel_render := false;
- 1: gdbg_map_use_accel_render := true;
- end;
- if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
- exit;
- end;
-
- if cmd = 'dbg_sq_coldet' then
+ procedure binaryFlag (var flag: Boolean; msg: string);
begin
- case getBool(1) of
- -1: begin end;
- 0: gdbg_map_use_accel_coldet := false;
- 1: gdbg_map_use_accel_coldet := true;
- end;
- if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
- exit;
- end;
-
- if (cmd = 'sq_use_grid') or (cmd = 'sq_use_tree') then
- begin
- gdbg_map_use_tree_coldet := (cmd = 'sq_use_tree');
- if gdbg_map_use_tree_coldet then g_Console_Add('coldet acceleration: tree') else g_Console_Add('coldet acceleration: grid');
- exit;
- end;
-
- if (cmd = 'r_sq_use_grid') or (cmd = 'r_sq_use_tree') then
- begin
- gdbg_map_use_tree_draw := (cmd = 'r_sq_use_tree');
- if gdbg_map_use_tree_draw then g_Console_Add('render acceleration: tree') else g_Console_Add('render acceleration: grid');
- exit;
- end;
-
- if (cmd = 't_dump_node_queries') then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gdbg_map_dump_coldet_tree_queries := false;
- 1: gdbg_map_dump_coldet_tree_queries := true;
+ if (Length(p) > 2) then
+ begin
+ g_Console_Add('too many arguments to '''+P[0]+'''');
+ end
+ else
+ begin
+ case getBool(1) of
+ -1: begin end;
+ 0: flag := false;
+ 1: flag := true;
+ end;
+ if flag then g_Console_Add(msg+': tan') else g_Console_Add(msg+': ona');
end;
- if gdbg_map_dump_coldet_tree_queries then g_Console_Add('grid coldet tree queries: tan') else g_Console_Add('grid coldet tree queries: ona');
- exit;
end;
- if (cmd = 'mon_sq_enabled') then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gmon_debug_use_sqaccel := false;
- 1: gmon_debug_use_sqaccel := true;
- end;
- if gmon_debug_use_sqaccel then g_Console_Add('accelerated monster coldet: tan') else g_Console_Add('accelerated monster coldet: ona');
- exit;
- end;
+begin
+ //if not gDebugMode then exit;
+ cmd := LowerCase(P[0]);
- if (cmd = 'wtrace_sq_enabled') then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gwep_debug_fast_trace := false;
- 1: gwep_debug_fast_trace := true;
- end;
- if gwep_debug_fast_trace then g_Console_Add('accelerated weapon hitscan: tan') else g_Console_Add('accelerated weapon hitscan: ona');
- 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 = 'wtrace_sq_enabled') then begin binaryFlag(gwep_debug_fast_trace, 'accelerated weapon hitscan'); 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 = 'mon_think') then begin binaryFlag(gmon_debug_think, 'monster thinking'); exit; end;
end;
+
procedure DebugCommands(P: SArray);
var
a, b: Integer;
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