aboutsummaryrefslogtreecommitdiff
path: root/sword2/protocol.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-11-16 09:15:25 +0000
committerTorbjörn Andersson2004-11-16 09:15:25 +0000
commit7adc1f419f6e8bb987c7d9b9e645a7c52c2821a1 (patch)
tree26083dc649cc7fbcc3020d02f720039a6514aa86 /sword2/protocol.cpp
parent525df7cff072bec7c3d0af96513a6d0d3010f7d0 (diff)
downloadscummvm-rg350-7adc1f419f6e8bb987c7d9b9e645a7c52c2821a1.tar.gz
scummvm-rg350-7adc1f419f6e8bb987c7d9b9e645a7c52c2821a1.tar.bz2
scummvm-rg350-7adc1f419f6e8bb987c7d9b9e645a7c52c2821a1.zip
Cleanup
svn-id: r15826
Diffstat (limited to 'sword2/protocol.cpp')
-rw-r--r--sword2/protocol.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sword2/protocol.cpp b/sword2/protocol.cpp
index e928fd0e0a..99d6b6a392 100644
--- a/sword2/protocol.cpp
+++ b/sword2/protocol.cpp
@@ -75,7 +75,7 @@ ScreenHeader *Sword2Engine::fetchScreenHeader(byte *screenFile) {
*/
LayerHeader *Sword2Engine::fetchLayerHeader(byte *screenFile, uint16 layerNo) {
-#ifdef _SWORD2_DEBUG
+#ifdef SWORD2_DEBUG
ScreenHeader *screenHead = fetchScreenHeader(screenFile);
if (layerNo > screenHead->noLayers - 1)
@@ -118,7 +118,7 @@ AnimHeader *Sword2Engine::fetchAnimHeader(byte *animFile) {
CdtEntry *Sword2Engine::fetchCdtEntry(byte *animFile, uint16 frameNo) {
AnimHeader *animHead = fetchAnimHeader(animFile);
-#ifdef _SWORD2_DEBUG
+#ifdef SWORD2_DEBUG
if (frameNo > animHead->noAnimFrames - 1)
error("fetchCdtEntry(animFile,%d) - anim only %d frames", frameNo, animHead->noAnimFrames);
#endif
@@ -144,7 +144,7 @@ FrameHeader *Sword2Engine::fetchFrameHeader(byte *animFile, uint16 frameNo) {
Parallax *Sword2Engine::fetchBackgroundParallaxLayer(byte *screenFile, int layer) {
MultiScreenHeader *mscreenHeader = (MultiScreenHeader *) (screenFile + sizeof(StandardHeader));
-#ifdef _SWORD2_DEBUG
+#ifdef SWORD2_DEBUG
if (mscreenHeader->bg_parallax[layer] == 0)
error("fetchBackgroundParallaxLayer(%d) - No parallax layer exists", layer);
#endif
@@ -155,7 +155,7 @@ Parallax *Sword2Engine::fetchBackgroundParallaxLayer(byte *screenFile, int layer
Parallax *Sword2Engine::fetchBackgroundLayer(byte *screenFile) {
MultiScreenHeader *mscreenHeader = (MultiScreenHeader *) (screenFile + sizeof(StandardHeader));
-#ifdef _SWORD2_DEBUG
+#ifdef SWORD2_DEBUG
if (mscreenHeader->screen == 0)
error("fetchBackgroundLayer (%d) - No background layer exists");
#endif
@@ -166,7 +166,7 @@ Parallax *Sword2Engine::fetchBackgroundLayer(byte *screenFile) {
Parallax *Sword2Engine::fetchForegroundParallaxLayer(byte *screenFile, int layer) {
MultiScreenHeader *mscreenHeader = (MultiScreenHeader *) (screenFile + sizeof(StandardHeader));
-#ifdef _SWORD2_DEBUG
+#ifdef SWORD2_DEBUG
if (mscreenHeader->fg_parallax[layer] == 0)
error("fetchForegroundParallaxLayer(%d) - No parallax layer exists", layer);
#endif