[Scummvm-git-logs] scummvm master -> 0eded81987f3c0f37138c82e9a75cd21f3b61871

digitall noreply at scummvm.org
Sun Feb 12 13:03:20 UTC 2023


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:
0eded81987 MM: MM1: Fix Array Comparison GCC Compiler Warning


Commit: 0eded81987f3c0f37138c82e9a75cd21f3b61871
    https://github.com/scummvm/scummvm/commit/0eded81987f3c0f37138c82e9a75cd21f3b61871
Author: D G Turner (digitall at scummvm.org)
Date: 2023-02-12T13:01:49Z

Commit Message:
MM: MM1: Fix Array Comparison GCC Compiler Warning

This warning is emitted when -Warray-compare is passed to GCC.

Changed paths:
    engines/mm/mm1/data/roster.cpp


diff --git a/engines/mm/mm1/data/roster.cpp b/engines/mm/mm1/data/roster.cpp
index 1a8a53d54a0..2b0ca105b67 100644
--- a/engines/mm/mm1/data/roster.cpp
+++ b/engines/mm/mm1/data/roster.cpp
@@ -70,7 +70,7 @@ void Roster::update(const IntArray &charNums) {
 		int destIndex;
 		if (charNums.size() == g_globals->_party.size() &&
 				charNums[i] < ROSTER_COUNT &&
-				_items[charNums[i]]._name == c._name) {
+				!strcmp(_items[charNums[i]]._name, c._name)) {
 			// Started game from title screen and set up party,
 			// so we known the correct roster index already
 			destIndex = charNums[i];




More information about the Scummvm-git-logs mailing list