From c34dae8effa7e5cc207aae384f6447ff8956472d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Einar=20Johan=20T=2E=20S=C3=B8m=C3=A5en?=
 <einarjohants@gmail.com>
Date: Sat, 1 Oct 2011 02:56:54 +0200
Subject: [PATCH] GRIM: Change DEBUG_SMUSH to DEBUG_MOVIE

---
 engines/grim/debug.h                        |  4 ++--
 engines/grim/movie/codecs/smush_decoder.cpp | 10 +++++-----
 engines/grim/movie/movie.cpp                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/engines/grim/debug.h b/engines/grim/debug.h
index ced2c4e2a29..b5548ccc03d 100644
--- a/engines/grim/debug.h
+++ b/engines/grim/debug.h
@@ -37,11 +37,11 @@ enum enDebugLevels {
 	DEBUG_BITMAPS = 16,
 	DEBUG_MODEL = 32,
 	DEBUG_STUB = 64,
-	DEBUG_SMUSH = 128,
+	DEBUG_MOVIE = 128,
 	DEBUG_IMUSE = 256,
 	DEBUG_CHORES = 512,
 	DEBUG_ALL = DEBUG_NORMAL | DEBUG_WARN | DEBUG_ERROR | DEBUG_LUA | DEBUG_BITMAPS |
-	            DEBUG_MODEL | DEBUG_STUB | DEBUG_SMUSH | DEBUG_IMUSE | DEBUG_CHORES
+				DEBUG_MODEL | DEBUG_STUB | DEBUG_MOVIE | DEBUG_IMUSE | DEBUG_CHORES
 };
 
 }
diff --git a/engines/grim/movie/codecs/smush_decoder.cpp b/engines/grim/movie/codecs/smush_decoder.cpp
index ce65cd6b24b..e4ef4f0d760 100644
--- a/engines/grim/movie/codecs/smush_decoder.cpp
+++ b/engines/grim/movie/codecs/smush_decoder.cpp
@@ -157,12 +157,12 @@ void SmushDecoder::handleFrame() {
 			//  MakeAnim animation type 'Bl16' parameters: 6000;8000;100;0;0;0;0;0;2;0;
 			//  Lola engine room (loops a limited number of times?):
 			//  MakeAnim animation type 'Bl16' parameters: 6000;8000;90;1;0;0;0;0;2;0;
-			if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
+			if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
 				debug("Announcement data: %s\n", anno);
 			// It looks like the announcement data is actually for setting some of the
 			// header parameters, not for any looping purpose
 		} else {
-			if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
+			if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
 				debug("Announcement header not understood: %s\n", anno);
 		}
 		delete[] anno;
@@ -185,7 +185,7 @@ void SmushDecoder::handleFrame() {
 			else
 				handleWave(frame + pos + 8 + 4, decompressed_size);
 			pos += READ_BE_UINT32(frame + pos + 4) + 8;
-		} else if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL) {
+		} else if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL) {
 			error("SmushDecoder::handleFrame() unknown tag");
 		}
 	} while (pos < size);
@@ -443,7 +443,7 @@ bool SmushDecoder::setupAnim() {
 
 	flags = READ_LE_UINT16(s_header + 18);
 	// Output information for checking out the flags
-	if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL) {
+	if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL) {
 		warning("SMUSH Flags:");
 		for (int i = 0; i < 16; i++)
 			warning(" %d", (flags & (1 << i)) != 0);
@@ -481,7 +481,7 @@ bool SmushDecoder::loadStream(Common::SeekableReadStream *stream) {
 }
 
 bool SmushDecoder::loadFile(const Common::String &filename) {
-	if (gDebugLevel == DEBUG_SMUSH)
+	if (gDebugLevel == DEBUG_MOVIE)
 		warning("Playing video '%s'.\n", filename.c_str());
 
 	if (g_grim->getGameFlags() & ADGF_DEMO) {
diff --git a/engines/grim/movie/movie.cpp b/engines/grim/movie/movie.cpp
index c95d95ed221..7cb4afc4573 100644
--- a/engines/grim/movie/movie.cpp
+++ b/engines/grim/movie/movie.cpp
@@ -132,7 +132,7 @@ bool MoviePlayer::play(const char *filename, bool looping, int x, int y) {
 	if (!_videoDecoder->loadFile(_fname))
 		return false;
 
-	if (gDebugLevel == DEBUG_SMUSH)
+	if (gDebugLevel == DEBUG_MOVIE)
 		warning("Playing video '%s'.\n", filename);
 
 	init();