no more old mapreader: use textmap reader both for text and for binary maps

[d2df-sdl.git] / src / game / g_phys.pas

diff --git a/src/game/g_phys.pas b/src/game/g_phys.pas
index d581eb3903e325e6fc8ba94a7f659df01167a7a0..498bd7587489f9faf6e72ffca873c72e06de6702 100644 (file)
--- a/src/game/g_phys.pas
+++ b/src/game/g_phys.pas
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
 unit g_phys;
 
 interface
@@ -143,26 +143,6 @@ begin
         end;
 end;
 
-function CollideMonsters(Obj: PObj; XInc, YInc: Integer): Boolean;
-var
-  a: Integer;
-begin
-  Result := False;
-
-  if gMonsters = nil then
-    Exit;
-
-  for a := 0 to High(gMonsters) do
-    if gMonsters[a] <> nil then
-      if gMonsters[a].Live and
-         gMonsters[a].Collide(Obj^.X+Obj^.Rect.X+XInc, Obj^.Y+Obj^.Rect.Y+YInc,
-                              Obj^.Rect.Width, Obj^.Rect.Height) then
-      begin
-        Result := True;
-        Exit;
-      end;
-end;
-
 function Blocked(Obj: PObj; XInc, YInc: Integer): Boolean;
 begin
   Result := g_Map_CollidePanel(Obj^.X+Obj^.Rect.X+XInc, Obj^.Y+Obj.Rect.Y+YInc,
@@ -481,13 +461,13 @@ _move:
                                          Obj^.Rect.Width,
                                          Obj^.Rect.Height*2 div 3);
       case wtx of
-        TEXTURE_SPECIAL_WATER:
+        LongWord(TEXTURE_SPECIAL_WATER):
           g_Obj_Splash(Obj, 3);
-        TEXTURE_SPECIAL_ACID1:
+        LongWord(TEXTURE_SPECIAL_ACID1):
           g_Obj_Splash(Obj, 2);
-        TEXTURE_SPECIAL_ACID2:
+        LongWord(TEXTURE_SPECIAL_ACID2):
           g_Obj_Splash(Obj, 1);
-        TEXTURE_NONE:
+        LongWord(TEXTURE_NONE):
           ;
         else
           g_Obj_Splash(Obj, 0);