diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 8430c9f98eecc88eba2aceba3096c4078e3f1704..a5790239f616380501b8e33b29ce7a19d0d7954d 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
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;
-function g_CollideMonster(X, Y: Integer; Width, Height: Word): Boolean;
function g_PatchLength(X1, Y1, X2, Y2: Integer): Word;
-function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean;
+function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean; // `true`: no wall hit
function g_GetAcidHit(X, Y: Integer; Width, Height: Word): Byte;
function g_Look(a, b: PObj; d: TDirection): Boolean;
procedure IncMax(var A: Integer; B, Max: Integer); overload;
end;
end;
-function g_CollideMonster(X, Y: Integer; Width, Height: Word): Boolean;
-var
- a: Integer;
-begin
- Result := False;
-
- if gMonsters = nil then Exit;
-
- for a := 0 to High(gMonsters) do
- if (gMonsters[a] <> nil) and gMonsters[a].Live then
- if g_Obj_Collide(X, Y, Width, Height, @gMonsters[a].Obj) then
- begin
- Result := True;
- Exit;
- end;
-end;
function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean;
var
+ wallHitX: Integer = 0;
+ wallHitY: Integer = 0;
+(*
i: Integer;
dx, dy: Integer;
Xerr, Yerr, d: LongWord;
incX, incY: Integer;
x, y: Integer;
+*)
begin
- Result := False;
+ (*
+ result := False;
Assert(gCollideMap <> nil, 'g_TraceVector: gCollideMap = nil');
end;
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;
end;
+
function g_CreateUID(UIDType: Byte): Word;
var
ok: Boolean;
UID_MONSTER:
begin
- repeat
- Result := UID_MAX_PLAYER+$1+Random(UID_MAX_MONSTER-UID_MAX_GAME-UID_MAX_PLAYER+$1);
-
- ok := True;
- if gMonsters <> nil then
- for i := 0 to High(gMonsters) do
- if gMonsters[i] <> nil then
- if Result = gMonsters[i].UID then
- begin
- ok := False;
- Break;
- end;
- until ok;
+ //FIXME!!!
+ while true do
+ begin
+ result := UID_MAX_PLAYER+$1+Random(UID_MAX_MONSTER-UID_MAX_GAME-UID_MAX_PLAYER+$1);
+ if (g_Monsters_ByUID(result) = nil) then break;
+ end;
end;
end;
end;
UID_MONSTER:
begin
- m := g_Monsters_Get(UID);
+ m := g_Monsters_ByUID(UID);
if m = nil then Exit;
if not m.Live then Exit;