[Scummvm-git-logs] scummvm master -> 5f1126653a31e898ff0cba5c172bc4342c47ff4f

digitall 547637+digitall at users.noreply.github.com
Wed Jul 8 15:43:18 UTC 2020


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:
5f1126653a ULTIMA8: Fix Compiler Warning


Commit: 5f1126653a31e898ff0cba5c172bc4342c47ff4f
    https://github.com/scummvm/scummvm/commit/5f1126653a31e898ff0cba5c172bc4342c47ff4f
Author: D G Turner (digitall at scummvm.org)
Date: 2020-07-08T16:41:06+01:00

Commit Message:
ULTIMA8: Fix Compiler Warning

Changed paths:
    engines/ultima/ultima8/graphics/type_flags.cpp


diff --git a/engines/ultima/ultima8/graphics/type_flags.cpp b/engines/ultima/ultima8/graphics/type_flags.cpp
index 2b3b746ba9..2297a2ddc2 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/graphics/type_flags.cpp
@@ -138,7 +138,7 @@ void TypeFlags::load(Common::SeekableReadStream *rs) {
 			si._y = (data[3] >> 2) & 0x1F;
 			si._z = ((data[4] << 1) | (data[3] >> 7)) & 0x1F;
 
-			si._unknown = (unk2data << 24) + ((data[4] & 0xF0) << 16) | (data[5] << 8) | data[8];
+			si._unknown = (unk2data << 24) + (((data[4] & 0xF0) << 16) | (data[5] << 8) | data[8]);
 
 			// This seems to be how it's used..
 			si._weight = data[7];




More information about the Scummvm-git-logs mailing list