Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33924

3 files changed, 15 insertions, 14 deletions

diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 0fa8b579ca..1e632a034e 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -544,8 +544,8 @@ bool ScummEngine::checkXYInBoxBounds(int boxnum, int x, int y) {
 	// Corner case: If the box is a simple line segment, we consider the
 	// point to be contained "in" (or rather, lying on) the line if it
 	// is very close to its projection to the line segment.
-	if (box.ul == box.ur && box.lr == box.ll ||
-		box.ul == box.ll && box.ur == box.lr) {
+	if ((box.ul == box.ur && box.lr == box.ll) ||
+		(box.ul == box.ll && box.ur == box.lr)) {
 
 		Common::Point tmp;
 		tmp = closestPtOnLine(box.ul, box.lr, p);
@@ -803,8 +803,8 @@ bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, Common::Point
 				}
 
 				if (box1.ul.y > box2.ur.y || box2.ul.y > box1.ur.y ||
-						(box1.ur.y == box2.ul.y || box2.ur.y == box1.ul.y) &&
-						box1.ul.y != box1.ur.y && box2.ul.y != box2.ur.y) {
+						((box1.ur.y == box2.ul.y || box2.ur.y == box1.ul.y) &&
+						box1.ul.y != box1.ur.y && box2.ul.y != box2.ur.y)) {
 					if (flag & 1)
 						SWAP(box1.ul.y, box1.ur.y);
 					if (flag & 2)
@@ -858,8 +858,8 @@ bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, Common::Point
 				}
 
 				if (box1.ul.x > box2.ur.x || box2.ul.x > box1.ur.x ||
-						(box1.ur.x == box2.ul.x || box2.ur.x == box1.ul.x) &&
-						box1.ul.x != box1.ur.x && box2.ul.x != box2.ur.x) {
+						((box1.ur.x == box2.ul.x || box2.ur.x == box1.ul.x) &&
+						box1.ul.x != box1.ur.x && box2.ul.x != box2.ur.x)) {
 					if (flag & 1)
 						SWAP(box1.ul.x, box1.ur.x);
 					if (flag & 2)
@@ -1074,8 +1074,8 @@ bool ScummEngine::areBoxesNeighbours(int box1nr, int box2nr) {
 				}
 				if (box.ur.y < box2.ul.y ||
 						box.ul.y > box2.ur.y ||
-						(box.ul.y == box2.ur.y ||
-						 box.ur.y == box2.ul.y) && box2.ur.y != box2.ul.y && box.ul.y != box.ur.y) {
+						((box.ul.y == box2.ur.y ||
+						 box.ur.y == box2.ul.y) && box2.ur.y != box2.ul.y && box.ul.y != box.ur.y)) {
 				} else {
 					return true;
 				}
@@ -1103,8 +1103,8 @@ bool ScummEngine::areBoxesNeighbours(int box1nr, int box2nr) {
 				}
 				if (box.ur.x < box2.ul.x ||
 						box.ul.x > box2.ur.x ||
-						(box.ul.x == box2.ur.x ||
-						 box.ur.x == box2.ul.x) && box2.ur.x != box2.ul.x && box.ul.x != box.ur.x) {
+						((box.ul.x == box2.ur.x ||
+						 box.ur.x == box2.ul.x) && box2.ur.x != box2.ul.x && box.ul.x != box.ur.x)) {
 
 				} else {
 					return true;
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 0622e3c5fe..0cc0f3aa1c 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -828,9 +828,10 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
 	// unknown MD5, or with a medium debug level in case of a known MD5 (for
 	// debugging purposes).
 	if (!findInMD5Table(res.md5.c_str())) {
-		printf("Your game version appears to be unknown. Please, report the following\n");
-		printf("data to the ScummVM team along with name of the game you tried to add\n");
-		printf("and its version/language/etc.:\n");
+		printf("Your game version appears to be unknown. If this is *NOT* a fan-modified\n");
+		printf("version (in particular, not a fan-made translation), please, report the\n");
+		printf("following data to the ScummVM team along with name of the game you tried\n");
+		printf("to add and its version/language/etc.:\n");
 
 		printf("  SCUMM gameid '%s', file '%s', MD5 '%s'\n\n",
 				res.game.gameid,
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 1d90b5e4af..c5c055249e 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1402,7 +1402,7 @@ void ScummEngine_v5::o5_ifClassOfIs() {
 	while ((_opcode = fetchScriptByte()) != 0xFF) {
 		cls = getVarOrDirectWord(PARAM_1);
 		b = getClass(act, cls);
-		if (cls & 0x80 && !b || !(cls & 0x80) && b)
+		if (((cls & 0x80) && !b) || (!(cls & 0x80) && b))
 			cond = false;
 	}
 	if (cond)