diff options
Diffstat (limited to 'engines/sherlock')
-rw-r--r-- | engines/sherlock/scalpel/drivers/adlib.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.h | 12 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/engines/sherlock/scalpel/drivers/adlib.cpp b/engines/sherlock/scalpel/drivers/adlib.cpp index 5786a33234..2a56d6a264 100644 --- 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 index dbc3945582..552bcf00c5 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.h +++ b/engines/sherlock/scalpel/scalpel_user_interface.h @@ -80,12 +80,6 @@ private: 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 */ void lookScreen(const Common::Point &pt); @@ -172,6 +166,12 @@ public: * (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 index 66a66bad74..2a13b2a450 100644 --- 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(); } |