[Scummvm-git-logs] scummvm master -> 48d3ce35f5eb3545078b079a7dda097496db54ba

[mduggan]

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:
48d3ce35f5 ULTIMA8: Fix small bug in recording unknown crusader data


Commit: 48d3ce35f5eb3545078b079a7dda097496db54ba
    https://github.com/scummvm/scummvm/commit/48d3ce35f5eb3545078b079a7dda097496db54ba
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-06-01T14:25:58+09:00

Commit Message:
ULTIMA8: Fix small bug in recording unknown crusader data

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 fe9419fbcf..c763d838d7 100644
--- a/engines/ultima/ultima8/graphics/type_flags.cpp
+++ b/engines/ultima/ultima8/graphics/type_flags.cpp
@@ -136,7 +136,7 @@ void TypeFlags::load(Common::SeekableReadStream *rs) {
 			si._y = (data[3] >> 2) & 0x1F;
 			si._z = ((data[4] << 1) | (data[3] >> 7)) & 0x1F;
 
-			si._unknown = ((data[4] & 0xF0) << 24) & (data[5] << 16) & (data[7] << 8) & data[8];
+			si._unknown = ((data[4] & 0xF0) << 24) | (data[5] << 16) | (data[7] << 8) | data[8];
 
 			if (data[6] & 0x01) si._flags |= ShapeInfo::SI_EDITOR;
 			if (data[6] & 0x02) si._flags |= ShapeInfo::SI_CRUSUNK61;