X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_basic.pas;h=98cebcce846067023ff07b3fa558f1c9ddba0797;hb=c3a9113817b4e18cb5687a11b057161e63040e06;hp=e001f8567a3af1ad810da064330ec9cb595d0183;hpb=e0ef894b62b50d6a7bd7e1dfa42ee3f1a839403a;p=d2df-sdl.git

diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index e001f85..98cebcc 100644
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
@@ -47,7 +47,6 @@ function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean;
 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_GetAcidHit(X, Y: Integer; Width, Height: Word): Byte;
@@ -143,11 +142,6 @@ begin
       end;
 end;
 
-function g_CollideMonster(X, Y: Integer; Width, Height: Word): Boolean;
-begin
-  result := g_Mons_AnyAt(X, Y, Width, Height);
-end;
-
 function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean;
 var
   i: Integer;
@@ -232,7 +226,7 @@ begin
       while true do
       begin
         result := UID_MAX_PLAYER+$1+Random(UID_MAX_MONSTER-UID_MAX_GAME-UID_MAX_PLAYER+$1);
-        if (g_Monsters_Get(result) = nil) then break;
+        if (g_Monsters_ByUID(result) = nil) then break;
       end;
     end;
   end;
@@ -953,7 +947,7 @@ begin
 
     UID_MONSTER:
     begin
-      m := g_Monsters_Get(UID);
+      m := g_Monsters_ByUID(UID);
       if m = nil then Exit;
       if not m.Live then Exit;