SHERLOCK: Further compilation fixes

scummvm · May 30, 2015 · cc165de · cc165de
1 parent ed96e94
commit cc165de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp
@@ -405,7 +405,7 @@ void MidiDriver_AdLib::send(uint32 b) {
 		pitchBendChange(channel, op1, op2);
 		break;
 	case 0xf0: // SysEx
-		warning("SysEx: %lx", b);
+		warning("SysEx: %x", b);
 		break;
 	default:
 		warning("ADLIB: Unknown event %02x", command);

diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -79,12 +79,6 @@ class ScalpelUserInterface: public UserInterface {
 	 */
 	void toggleButton(int num);
 
-	/**
-	 * Creates a text window and uses it to display the in-depth description
-	 * of the highlighted object
-	 */
-	void examine();
-
 	/**
 	 * Print the name of an object in the scene
 	 */
@@ -172,6 +166,12 @@ class ScalpelUserInterface: public UserInterface {
 	 * (not selected) position
 	 */
 	void restoreButton(int num);
+
+	/**
+	 * Creates a text window and uses it to display the in-depth description
+	 * of the highlighted object
+	 */
+	void examine();
 public:
 	/**
 	 * Resets the user interface

diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -229,7 +229,6 @@ void TattooScene::doBgAnim() {
 }
 
 void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
-	TattooEngine &vm = *((TattooEngine *)_vm);
 	People &people = *_vm->_people;
 	Screen &screen = *_vm->_screen;
 
@@ -244,7 +243,7 @@ void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
 			people[idx].adjustSprite();
 	}
 
-	if (_activeCAnim._images != nullptr && _activeCAnim._zPlacement != REMOVE) {
+	if ((_activeCAnim._images != nullptr) && (_activeCAnim._zPlacement != REMOVE)) {
 		_activeCAnim.getNextFrame();
 	}