diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 67285caa60e8cb5349cdd9f606ca1a66dc7f70ca..8430c9f98eecc88eba2aceba3096c4078e3f1704 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
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;
function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean;
+begin
+ result := g_Map_CollidePanel(X, Y, Width, Height, (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR), false);
+end;
+(*
var
a: Integer;
begin
Exit;
end;
end;
+*)
function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean;
var
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;