[Scummvm-git-logs] scummvm master -> ff4cd452b5c8df46d95bfcf7b11c23bd806b31d8

[digitall]

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:
ff4cd452b5 WINTERMUTE: Fix Duplicated Branch GCC Warnings


Commit: ff4cd452b5c8df46d95bfcf7b11c23bd806b31d8
    https://github.com/scummvm/scummvm/commit/ff4cd452b5c8df46d95bfcf7b11c23bd806b31d8
Author: D G Turner (digitall at scummvm.org)
Date: 2021-11-07T00:12:58Z

Commit Message:
WINTERMUTE: Fix Duplicated Branch GCC Warnings

These are emitted if -Wduplicated-branches is passed.

Changed paths:
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/particles/part_emitter.cpp
    engines/wintermute/base/scriptables/script_ext_directory.cpp
    engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index d7be71e643..61e244348d 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -1898,15 +1898,18 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SetSavingScreen") == 0) {
 		stack->correctParams(3);
-		ScValue *val = stack->pop();
+		/* ScValue *val = */stack->pop();
 		int saveImageX = stack->pop()->getInt();
 		int saveImageY = stack->pop()->getInt();
 
+		// FIXME: Dead code or bug?
+#if 0
 		if (val->isNULL()) {
 			_renderer->setSaveImage(NULL, saveImageX, saveImageY);
 		} else {
+#endif
 			_renderer->setSaveImage(NULL, saveImageX, saveImageY);
-		}
+		//}
 		stack->pushNULL();
 		return STATUS_OK;
 	}
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 1c102d17ee..fb12a5c540 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -377,9 +377,7 @@ bool PartEmitter::sortParticlesByZ() {
 bool PartEmitter::compareZ(const PartParticle *p1, const PartParticle *p2) {
 	if (p1->_posZ < p2->_posZ) {
 		return true;
-	} else if (p1->_posZ > p2->_posZ) {
-		return false;
-	} else {
+	} else { // p1->_posZ >= p2->_posZ
 		return false;
 	}
 }
diff --git a/engines/wintermute/base/scriptables/script_ext_directory.cpp b/engines/wintermute/base/scriptables/script_ext_directory.cpp
index 1d6c105e80..247ff654a9 100644
--- a/engines/wintermute/base/scriptables/script_ext_directory.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_directory.cpp
@@ -106,8 +106,8 @@ bool SXDirectory::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 
 		// used in secret scene of "Art of Murder 1: FBI Confidential"
 		if (strcmp(dirName, "X:\\FBI\\data\\scenes\\17-magic\\") == 0 && strcmp(name, "GetDirectories") == 0) {
-			//TODO: return list of "scenes\17-magic" subfolders from data.dcp
-			warning("Directory.%s is not implemented! Returning empty array...", name);
+			// TODO: return list of "scenes\17-magic" subfolders from data.dcp
+			warning("FBI\\scenes\\17-magic Directory.%s is not implemented! Returning empty array...", name);
 		} else {
 			// No currently known games need this
 			warning("Directory.%s is not implemented! Returning empty array...", name);
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
index 276d1fb211..53c772caaf 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
@@ -419,9 +419,9 @@ bool SXMemBuffer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 			memcpy((byte *)_buffer+Start, &Pointer, sizeof(void*));
 			stack->pushBool(true);
 			*/
-			// TODO fix
+			// TODO: fix
+			debug(3, "SXMemBuffer::ScCallMethod - SetPointer Bounds FIXME");
 			stack->pushBool(false);
-
 		}
 		return STATUS_OK;
 	}