diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 2c540aad0a617fc7c2c51f3bc8060e7e4d057861..98cebcce846067023ff07b3fa558f1c9ddba0797 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_CollideItem(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_GetAcidHit(X, Y: Integer; Width, Height: Word): Byte;
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_CollideItem(X, Y: Integer; Width, Height: Word): Boolean;
-var
- a: Integer;
-begin
- Result := False;
-
- if gItems = nil then
- Exit;
-
- for a := 0 to High(gItems) do
- if gItems[a].Live then
- if g_Obj_Collide(X, Y, Width, Height, @gItems[a].Obj) then
- begin
- Result := True;
- Exit;
- end;
-end;
-
function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean;
var
i: Integer;
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;