diff options
| -rw-r--r-- | engines/sherlock/objects.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/talk.cpp | 6 | ||||
| -rw-r--r-- | engines/sherlock/user_interface.cpp | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 9e92b95532..78b6cda2d3 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -309,10 +309,10 @@ void Sprite::checkSprite() { if (_delta.x > 0) // Go to right side walkPos.x = objBounds.right + CLEAR_DIST_X; - else if (_delta.x < 0) + else if (_delta.x < 0) { // Go to left side walkPos.x = objBounds.left - CLEAR_DIST_X; - else { + } else { // Going straight up or down. So choose best side if (spritePt.x >= (objBounds.left + objBounds.width() / 2)) walkPos.x = objBounds.right + CLEAR_DIST_X; diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 0ac1bbd6aa..9be2b035d4 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -1041,8 +1041,7 @@ void Talk::doScript(const Common::String &script) { pullSequence(); pushSequence(_speaker); setSequence(_speaker); - } - else { + } else { setSequence(_speaker); } @@ -1071,8 +1070,7 @@ void Talk::doScript(const Common::String &script) { // Remove portrait? if (str[0] == REMOVE_PORTRAIT) { _speaker = 255; - } - else { + } else { // Nope, so set the first speaker people.setTalking(_speaker); } diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp index 903b1e6002..a2a356127c 100644 --- a/engines/sherlock/user_interface.cpp +++ b/engines/sherlock/user_interface.cpp @@ -1468,8 +1468,7 @@ void UserInterface::doLookControl() { _menuMode = STD_MODE; events.clearEvents(); } - } - else { + } else { // Looking at an inventory object // Backup the user interface Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); |