aboutsummaryrefslogtreecommitdiff
path: root/sword2/function.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/function.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/function.cpp')
-rw-r--r--sword2/function.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sword2/function.cpp b/sword2/function.cpp
index e6d4656b0f..48b06f0812 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -284,7 +284,7 @@ int32 FN_flash(int32 *params) // (James14feb97)
{
// params 0: colour to flash
-#ifdef _DEBUG
+#ifdef _BS2_DEBUG
uint32 count;
@@ -315,7 +315,7 @@ int32 FN_flash(int32 *params) // (James14feb97)
SetPalette(0, 1, black, RDPAL_INSTANT);
-#endif // _DEBUG
+#endif // _BS2_DEBUG
return(IR_CONT);
}
@@ -327,7 +327,7 @@ int32 FN_colour(int32 *params) // (James14feb97)
{
// params 0: colour (see defines above)
-#ifdef _DEBUG
+#ifdef _BS2_DEBUG
switch (params[0]) // what colour?
{
@@ -352,7 +352,7 @@ int32 FN_colour(int32 *params) // (James14feb97)
break;
}
-#endif // _DEBUG
+#endif // _BS2_DEBUG
return(IR_CONT);
}