`g_basic.g_CollideLevel()` now using accelerated coldet

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

diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 4b505ab50bcd76074c76e772a25b76c9aec226f0..2c540aad0a617fc7c2c51f3bc8060e7e4d057861 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
@@ -1,9 +1,25 @@
+(* Copyright (C)  DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 ../shared/a_modes.inc}
 unit g_basic;
 
 interface
 
 uses
-  WADEDITOR, g_phys;
+  wadreader, g_phys;
 
 const
   GAME_VERSION  = '0.667';
@@ -86,6 +102,10 @@ begin
 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
@@ -105,6 +125,7 @@ begin
       Exit;
     end;
 end;
+*)
 
 function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean;
 var
@@ -496,14 +517,14 @@ begin
   a := abs(vx);
   b := abs(vy);
 
-  if a = 0 then 
-    c := 0
-  else 
+  if a = 0 then
+    c := 90
+  else
     c := RadToDeg(ArcTan(b/a));
 
-  if vy < 0 then 
+  if vy < 0 then
     c := -c;
-  if vx > 0 then 
+  if vx > 0 then
     c := 180 - c;
 
   c := c + 180;
@@ -828,7 +849,7 @@ var
     begin
       while (fmt[m] = ' ') and (m < Length(fmt)) do
         Inc(m);
-      if (m >= Length(fmt)) then 
+      if (m >= Length(fmt)) then
         Break;
 
       if (fmt[m] = '%') then
@@ -894,7 +915,7 @@ begin
         else
           Break;
       end;
-      
+
       else {case}
         Break;
     end; {case}
@@ -967,7 +988,7 @@ begin
 
       o^ := p.Obj;
     end;
-  
+
     UID_MONSTER:
     begin
       m := g_Monsters_Get(UID);