[Scummvm-cvs-logs] scummvm master -> 944cf4c64fd978db9b49a4317a955dc681b51089

[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:
944cf4c64f SHERLOCK: Syntax fixes


Commit: 944cf4c64fd978db9b49a4317a955dc681b51089
    https://github.com/scummvm/scummvm/commit/944cf4c64fd978db9b49a4317a955dc681b51089
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-30T10:01:25-04:00

Commit Message:
SHERLOCK: Syntax fixes

Changed paths:
    engines/sherlock/scalpel/scalpel_people.cpp
    engines/sherlock/scalpel/scalpel_scene.cpp
    engines/sherlock/scalpel/scalpel_talk.cpp
    engines/sherlock/talk.cpp
    engines/sherlock/tattoo/tattoo_people.cpp



diff --git a/engines/sherlock/scalpel/scalpel_people.cpp b/engines/sherlock/scalpel/scalpel_people.cpp
index 57cf9f9..924095c 100644
--- a/engines/sherlock/scalpel/scalpel_people.cpp
+++ b/engines/sherlock/scalpel/scalpel_people.cpp
@@ -469,8 +469,7 @@ void ScalpelPeople::setTalkSequence(int speaker, int sequenceNum) {
 
 			if (obj._seqSize < MAX_TALK_SEQUENCES) {
 				warning("Tried to copy too many talk frames");
-			}
-			else {
+			} else {
 				for (int idx = 0; idx < MAX_TALK_SEQUENCES; ++idx) {
 					obj._sequences[idx] = people._characters[speaker]._talkSequences[idx];
 					if (idx > 0 && !obj._sequences[idx] && !obj._sequences[idx - 1])
diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp
index 999393f..b2c7339 100644
--- a/engines/sherlock/scalpel/scalpel_scene.cpp
+++ b/engines/sherlock/scalpel/scalpel_scene.cpp
@@ -732,8 +732,7 @@ int ScalpelScene::findBgShape(const Common::Point &pt) {
 			&& o._aType <= PERSON) {
 			if (o.getNewBounds().contains(pt))
 				return idx;
-		}
-		else if (o._type == NO_SHAPE) {
+		} else if (o._type == NO_SHAPE) {
 			if (o.getNoShapeBounds().contains(pt))
 				return idx;
 		}
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 69d1421..2dda817 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -211,8 +211,7 @@ void ScalpelTalk::talkInterface(const byte *&str) {
 		if (ui._windowOpen) {
 			screen.print(Common::Point(16, _yp), TALK_FOREGROUND, "%s",
 				people._characters[_speaker & 127]._name);
-		}
-		else {
+		} else {
 			screen.gPrint(Common::Point(16, _yp - 1), TALK_FOREGROUND, "%s",
 				people._characters[_speaker & 127]._name);
 			_openTalkWindow = true;
@@ -234,8 +233,7 @@ void ScalpelTalk::talkInterface(const byte *&str) {
 			--idx;
 			--_charCount;
 		}
-	}
-	else {
+	} else {
 		_endStr = true;
 	}
 
@@ -254,17 +252,14 @@ void ScalpelTalk::talkInterface(const byte *&str) {
 	if (_speaker != -1) {
 		if (ui._windowOpen) {
 			screen.print(Common::Point(16, _yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
-		}
-		else {
+		} else {
 			screen.gPrint(Common::Point(16, _yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 			_openTalkWindow = true;
 		}
-	}
-	else {
+	} else {
 		if (ui._windowOpen) {
 			screen.print(Common::Point(16, _yp), COMMAND_FOREGROUND, "%s", lineStr.c_str());
-		}
-		else {
+		} else {
 			screen.gPrint(Common::Point(16, _yp - 1), COMMAND_FOREGROUND, "%s", lineStr.c_str());
 			_openTalkWindow = true;
 		}
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 26550a7..fa00b9d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -399,7 +399,6 @@ void Talk::talkTo(const Common::String filename) {
 					if (_talkTo != -1 && !_talkHistory[_converseNum][select])
 						journal.record(_converseNum, select, true);
 					_talkHistory[_converseNum][select] = true;
-
 				}
 
 				ui._key = ui._oldKey = Scalpel::COMMANDS[TALK_MODE - 1];
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index ac43662..e3e957e 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -1283,8 +1283,7 @@ void TattooPeople::setTalkSequence(int speaker, int sequenceNum) {
 		if (obj.hasAborts()) {
 			talk.pushSequenceEntry(&obj);
 			obj._gotoSeq = sequenceNum;
-		}
-		else {
+		} else {
 			obj.setObjTalkSequence(sequenceNum);
 		}
 	} else if (objNum != -1) {