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

[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:
a8e5534a98 MTROPOLIS: Fix Omitted Logical Test in Data IO Template Code


Commit: a8e5534a98bcbc10487284b8c6cc286501d7223f
    https://github.com/scummvm/scummvm/commit/a8e5534a98bcbc10487284b8c6cc286501d7223f
Author: D G Turner (digitall at scummvm.org)
Date: 2024-02-28T19:42:30Z

Commit Message:
MTROPOLIS: Fix Omitted Logical Test in Data IO Template Code

This caused enum as logical expression GCC Compiler Warnings

Changed paths:
    engines/mtropolis/data.h


diff --git a/engines/mtropolis/data.h b/engines/mtropolis/data.h
index 7e9c37cd8f7..24dff6be943 100644
--- a/engines/mtropolis/data.h
+++ b/engines/mtropolis/data.h
@@ -83,7 +83,7 @@ struct DataIO<MTropolis::Data::DataFormat, Common::XPFloat> {
 		if (dataFormat == MTropolis::Data::kDataFormatMacintosh) {
 			DataIO<MTropolis::Data::DataFormat, uint16>::encode(dataFormat, data + 0, value.signAndExponent);
 			DataIO<MTropolis::Data::DataFormat, uint64>::encode(dataFormat, data + 2, value.mantissa);
-		} else if (MTropolis::Data::kDataFormatWindows) {
+		} else if (dataFormat == MTropolis::Data::kDataFormatWindows) {
 			uint64 doubleBits = 0;
 			bool overflowed = false;
 			value.toDoubleBitsSafe(doubleBits, overflowed);
@@ -95,7 +95,7 @@ struct DataIO<MTropolis::Data::DataFormat, Common::XPFloat> {
 		if (dataFormat == MTropolis::Data::kDataFormatMacintosh) {
 			DataIO<MTropolis::Data::DataFormat, uint16>::decode(dataFormat, data + 0, value.signAndExponent);
 			DataIO<MTropolis::Data::DataFormat, uint64>::decode(dataFormat, data + 2, value.mantissa);
-		} else if (MTropolis::Data::kDataFormatWindows) {
+		} else if (dataFormat == MTropolis::Data::kDataFormatWindows) {
 			uint64 doubleBits = 0;
 			DataIO<MTropolis::Data::DataFormat, uint64>::decode(dataFormat, data, doubleBits);
 			value = value.fromDoubleBits(doubleBits);