[Scummvm-cvs-logs] scummvm master -> e2803d77c6a693852b8c665bdedee5633ad5eec1

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e2803d77c6 SHERLOCK: RT: Fix compiler warnings


Commit: e2803d77c6a693852b8c665bdedee5633ad5eec1
    https://github.com/scummvm/scummvm/commit/e2803d77c6a693852b8c665bdedee5633ad5eec1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-30T20:20:42-04:00

Commit Message:
SHERLOCK: RT: Fix compiler warnings

Changed paths:
    engines/sherlock/image_file.cpp
    engines/sherlock/tattoo/tattoo_user_interface.h



diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp
index 7e14ebe..b9d87d4 100644
--- a/engines/sherlock/image_file.cpp
+++ b/engines/sherlock/image_file.cpp
@@ -619,6 +619,9 @@ void ImageFile3DO::load3DOCelFile(Common::SeekableReadStream &stream) {
 		// Seek to end of chunk
 		stream.seek(chunkStartPos + chunkSize);
 	}
+
+	// Warning below being used to silence unused variable warnings for now
+	warning("TODO: Remove %d %d %d", animFrameCount, ccbPPMP0, ccbPPMP1);
 }
 
 // Reads 3DO .cel data (room file format)
@@ -1004,6 +1007,9 @@ void ImageFile3DO::loadFont(Common::SeekableReadStream &stream) {
 		}
 	}
 
+	// Warning below being used to silence unused variable warnings for now
+	warning("TODO: Remove %d %d", curBitsLeft, curBitsReversed);
+
 	delete[] bitsTablePtr;
 	delete[] widthTablePtr;
 }
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
index 6d8ce76..994caa6 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.h
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -201,11 +201,6 @@ public:
 	 * Draws all the dialog rectangles for any items that need them
 	 */
 	void drawDialogRect(Surface &s, const Common::Rect &r, bool raised);
-
-	/**
-	 * Banish any active window
-	 */
-	void banishWindow();
 public:
 	/**
 	 * Resets the user interface
@@ -226,6 +221,11 @@ public:
 	 * Clear any active text window
 	 */
 	virtual void clearWindow();
+
+	/**
+	 * Banish any active window
+	 */
+	virtual void banishWindow();
 };
 
 } // End of namespace Tattoo