diff options
| author | Paul Gilbert | 2015-06-30 20:20:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-30 20:20:42 -0400 |
| commit | e2803d77c6a693852b8c665bdedee5633ad5eec1 (patch) | |
| tree | 983b01711c5c4cee86d8a8712d072f04bc6019f2 | |
| parent | 8e4fca0e75639caa5d425682d8e8d09a5dbf1c27 (diff) | |
| download | scummvm-rg350-e2803d77c6a693852b8c665bdedee5633ad5eec1.tar.gz scummvm-rg350-e2803d77c6a693852b8c665bdedee5633ad5eec1.tar.bz2 scummvm-rg350-e2803d77c6a693852b8c665bdedee5633ad5eec1.zip | |
SHERLOCK: RT: Fix compiler warnings
| -rw-r--r-- | engines/sherlock/image_file.cpp | 6 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.h | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp index 7e14ebebb4..b9d87d4f0d 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 6d8ce76a32..994caa6049 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 |