X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_basic.pas;h=53177473ac59a0c7da0a4f9d264fd60167f80212;hb=96165a1a95f0ea18a20dd8578fade4b46ec23746;hp=1f3add5d538fe6837f5ca0d3a942207da171fcb2;hpb=56fcde89a5a167007acdfa19d685dde09c7003df;p=d2df-sdl.git diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas index 1f3add5..5317747 100644 --- a/src/game/g_basic.pas +++ b/src/game/g_basic.pas @@ -88,11 +88,15 @@ procedure SortSArray(var S: SArray); function b_Text_Format(S: string): string; function b_Text_Unformat(S: string): string; + +var + gmon_dbg_los_enabled: Boolean = true; + implementation uses - Math, g_map, g_gfx, g_player, SysUtils, MAPDEF, - StrUtils, e_graphics, g_monsters, g_items; + Math, e_log, g_map, g_gfx, g_player, SysUtils, MAPDEF, + StrUtils, e_graphics, g_monsters, g_items, g_game; function g_PatchLength(X1, Y1, X2, Y2: Integer): Word; begin @@ -201,17 +205,10 @@ begin Result := True; *) - //result := false; - if g_Map_traceToNearestWall(x1, y1, x2, y2, @wallHitX, @wallHitY) then - begin - // check distance - //result := ((wallHitX-x1)*(wallHitX-x1)+(wallHitY-y1)*(wallHitY-y1) > (x2-x1)*(x2-x1)+(y2-y1)*(y2-y1)); - result := false; - end - else - begin - result := true; // no obstacles - end; + // `true` if no obstacles + if (g_profile_los) then g_Mons_LOS_Start(); + result := (g_Map_traceToNearestWall(x1, y1, x2, y2, @wallHitX, @wallHitY) = nil); + if (g_profile_los) then g_Mons_LOS_End(); end; @@ -455,6 +452,8 @@ end; function g_Look(a, b: PObj; d: TDirection): Boolean; begin + if not gmon_dbg_los_enabled then begin result := false; exit; end; // always "wall hit" + if ((b^.X > a^.X) and (d = D_LEFT)) or ((b^.X < a^.X) and (d = D_RIGHT)) then begin