[Scummvm-git-logs] scummvm master -> 56931a0dbb3904eb80b5921f8c659c31d07fbccd

[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:
56931a0dbb TITANIC: Formatting fixes for else blocks


Commit: 56931a0dbb3904eb80b5921f8c659c31d07fbccd
    https://github.com/scummvm/scummvm/commit/56931a0dbb3904eb80b5921f8c659c31d07fbccd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-21T18:45:57-05:00

Commit Message:
TITANIC: Formatting fixes for else blocks

Changed paths:
    engines/titanic/carry/brain.cpp
    engines/titanic/true_talk/bellbot_script.cpp


diff --git a/engines/titanic/carry/brain.cpp b/engines/titanic/carry/brain.cpp
index 64b0686..b00f026 100644
--- a/engines/titanic/carry/brain.cpp
+++ b/engines/titanic/carry/brain.cpp
@@ -75,8 +75,7 @@ bool CBrain::UseWithOtherMsg(CUseWithOtherMsg *msg) {
 		}
 
 		return true;
-	}
-	else {
+	} else {
 		return CCarry::UseWithOtherMsg(msg);
 	}
 }
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index 44fa961..5e000dd 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -173,15 +173,13 @@ int BellbotScript::process(const TTroomScript *roomScript, const TTsentence *sen
 				addResponse(getDialogueId(201687));
 				applyResponse();
 				return 2;
-			}
-			else if (roomScript->_scriptId == 111) {
+			} else if (roomScript->_scriptId == 111) {
 				addResponse(getDialogueId(201687));
 				applyResponse();
 				CTrueTalkManager::triggerAction(17, 0);
 				CTrueTalkManager::setFlags(40, 1);
 				return 2;
-			}
-			else {
+			} else {
 				addResponse(getDialogueId(200710));
 				addResponse(getDialogueId(201334));
 				applyResponse();