X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_basic.pas;h=e9412a38ee528f62e349972148444b0c239b8426;hb=d7d166dc3cd287276202e862746208892c4cc89f;hp=1f3add5d538fe6837f5ca0d3a942207da171fcb2;hpb=56fcde89a5a167007acdfa19d685dde09c7003df;p=d2df-sdl.git diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas index 1f3add5..e9412a3 100644 --- a/src/game/g_basic.pas +++ b/src/game/g_basic.pas @@ -40,13 +40,13 @@ type function g_CreateUID(UIDType: Byte): Word; function g_GetUIDType(UID: Word): Byte; function g_Collide(X1, Y1: Integer; Width1, Height1: Word; - X2, Y2: Integer; Width2, Height2: Word): Boolean; + X2, Y2: Integer; Width2, Height2: Word): Boolean; inline; function g_CollideLine(x1, y1, x2, y2, rX, rY: Integer; rWidth, rHeight: Word): Boolean; -function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean; -function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean; +function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean; inline; +function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean; inline; function g_CollideAround(X1, Y1: Integer; Width1, Height1: Word; - X2, Y2: Integer; Width2, Height2: Word): Boolean; -function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean; + X2, Y2: Integer; Width2, Height2: Word): Boolean; inline; +function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean; inline; function g_PatchLength(X1, Y1, X2, Y2: Integer): Word; function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean; // `true`: no wall hit function g_GetAcidHit(X, Y: Integer; Width, Height: Word): Byte; @@ -88,18 +88,22 @@ 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 Result := Min(Round(Hypot(Abs(X2-X1), Abs(Y2-Y1))), 65535); end; -function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean; +function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean; inline; begin result := g_Map_CollidePanel(X, Y, Width, Height, (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR), false); end; @@ -125,7 +129,7 @@ begin end; *) -function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean; +function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean; inline; var a: Integer; begin @@ -134,7 +138,7 @@ begin if gPlayers = nil then Exit; for a := 0 to High(gPlayers) do - if (gPlayers[a] <> nil) and gPlayers[a].Live then + if (gPlayers[a] <> nil) and gPlayers[a].alive then if gPlayers[a].Collide(X, Y, Width, Height) then begin Result := True; @@ -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; @@ -264,7 +261,7 @@ begin end; function g_Collide(X1, Y1: Integer; Width1, Height1: Word; - X2, Y2: Integer; Width2, Height2: Word): Boolean; + X2, Y2: Integer; Width2, Height2: Word): Boolean; inline; begin Result := not ( ((Y1 + Height1 <= Y2) or (Y2 + Height2 <= Y1)) or @@ -273,7 +270,7 @@ begin end; function g_CollideAround(X1, Y1: Integer; Width1, Height1: Word; - X2, Y2: Integer; Width2, Height2: Word): Boolean; + X2, Y2: Integer; Width2, Height2: Word): Boolean; inline; begin Result := g_Collide(X1, Y1, Width1, Height1, X2, Y2, Width2, Height2) or g_Collide(X1+1, Y1, Width1, Height1, X2, Y2, Width2, Height2) or @@ -282,7 +279,7 @@ begin g_Collide(X1, Y1-1, Width1, Height1, X2, Y2, Width2, Height2); end; -function c(X1, Y1, Width1, Height1, X2, Y2, Width2, Height2: Integer): Boolean; +function c(X1, Y1, Width1, Height1, X2, Y2, Width2, Height2: Integer): Boolean; inline; begin Result := not (((Y1 + Height1 <= Y2) or (Y1 >= Y2 + Height2)) or @@ -290,13 +287,13 @@ begin (X1 >= X2 + Width2))); end; -function g_Collide2(X1, Y1, X2, Y2, X3, Y3, X4, Y4: Integer): Boolean; +function g_Collide2(X1, Y1, X2, Y2, X3, Y3, X4, Y4: Integer): Boolean; inline; begin //Result := not (((Y2 <= Y3) or (Y1 >= Y4)) or ((X2 <= X3) or (X1 >= X4))); Result := c(X1, Y1, X2-X1, Y2-Y1, X3, Y3, X4-X3, Y4-Y3); end; -function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean; +function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean; inline; begin X := X-X2; Y := Y-Y2; @@ -455,8 +452,10 @@ end; function g_Look(a, b: PObj; d: TDirection): Boolean; begin - if ((b^.X > a^.X) and (d = D_LEFT)) or - ((b^.X < a^.X) and (d = D_RIGHT)) then + if not gmon_dbg_los_enabled then begin result := false; exit; end; // always "wall hit" + + if ((b^.X > a^.X) and (d = TDirection.D_LEFT)) or + ((b^.X < a^.X) and (d = TDirection.D_RIGHT)) then begin Result := False; Exit; @@ -960,7 +959,7 @@ begin begin p := g_Player_Get(UID); if p = nil then Exit; - if not p.Live then Exit; + if not p.alive then Exit; o^ := p.Obj; end; @@ -969,7 +968,7 @@ begin begin m := g_Monsters_ByUID(UID); if m = nil then Exit; - if not m.Live then Exit; + if not m.alive then Exit; o^ := m.Obj; end;