aboutsummaryrefslogtreecommitdiff
path: root/sword2/router.cpp
diff options
context:
space:
mode:
authorJonathan Gray2003-07-28 09:49:46 +0000
committerJonathan Gray2003-07-28 09:49:46 +0000
commitf22cca2be21035760c6b2cfb72ad4e1ba5a08182 (patch)
treee588774ea7e4ebaee6b013066fabe3a5eb3af6e7 /sword2/router.cpp
parent84bccaa83b996ef49fbedf6bb52bb64e9f3c5fd4 (diff)
downloadscummvm-rg350-f22cca2be21035760c6b2cfb72ad4e1ba5a08182.tar.gz
scummvm-rg350-f22cca2be21035760c6b2cfb72ad4e1ba5a08182.tar.bz2
scummvm-rg350-f22cca2be21035760c6b2cfb72ad4e1ba5a08182.zip
rename _DEBUG define to _BS2_DEBUG to stop it conflicting with VC
svn-id: r9237
Diffstat (limited to 'sword2/router.cpp')
-rw-r--r--sword2/router.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sword2/router.cpp b/sword2/router.cpp
index 6fa7d02a09..0b50fc0d9e 100644
--- a/sword2/router.cpp
+++ b/sword2/router.cpp
@@ -319,7 +319,7 @@ void AllocateRouteMem(void)
{
slotNo++;
- #ifdef _DEBUG
+ #ifdef _BS2_DEBUG
if (slotNo == TOTAL_ROUTE_SLOTS)
Con_fatal_error("ERROR: route_slots[] full in AllocateRouteMem() (%s line %u)",__FILE__,__LINE__);
#endif
@@ -722,7 +722,7 @@ int32 SmoothestPath()
options = NewCheck(1, route[p].x, route[p].y, route[p + 1].x, route[p + 1].y);
-#ifdef _DEBUG
+#ifdef _BS2_DEBUG
if (options == 0)
{
Zdebug("BestTurns fail %d %d %d %d",route[p].x, route[p].y, route[p + 1].x, route[p + 1].y);
@@ -756,7 +756,7 @@ int32 SmoothestPath()
#endif
-#ifdef _DEBUG
+#ifdef _BS2_DEBUG
if (steps == 0)
{
Zdebug("BestTurns failed %d %d %d %d",route[p].x, route[p].y, route[p + 1].x, route[p + 1].y);
@@ -1459,7 +1459,7 @@ void SlidyWalkAnimator(_walkData *walkAnim)
-#ifdef _DEBUG
+#ifdef _BS2_DEBUG
if (lastRealDir == 99)
{
Con_fatal_error("SlidyWalkAnimatorlast direction error (%s line %u)",__FILE__,__LINE__);
@@ -2988,7 +2988,7 @@ void LoadWalkGrid(void)
//-------------------------------
// check that we're not going to exceed the max allowed in the complete walkgrid arrays
- #ifdef _DEBUG
+ #ifdef _BS2_DEBUG
if ((nbars+theseBars) >= O_GRID_SIZE)
Con_fatal_error("Adding walkgrid(%d): %d+%d bars exceeds max %d (%s line %u)", walkGridList[entry], nbars, theseBars, O_GRID_SIZE, __FILE__, __LINE__);