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

[mduggan]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4cfa4c9c0c ULTIMA8: Fix SuperSprite itemsize calculation
cc34d4ee63 ULTIMA8: Remove outdated comment


Commit: 4cfa4c9c0c18391a72813840b46914825d05d739
    https://github.com/scummvm/scummvm/commit/4cfa4c9c0c18391a72813840b46914825d05d739
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-15T22:28:24+09:00

Commit Message:
ULTIMA8: Fix SuperSprite itemsize calculation

Changed paths:
    engines/ultima/ultima8/world/super_sprite_process.cpp


diff --git a/engines/ultima/ultima8/world/super_sprite_process.cpp b/engines/ultima/ultima8/world/super_sprite_process.cpp
index fcc17a4fbe7..43c50195085 100644
--- a/engines/ultima/ultima8/world/super_sprite_process.cpp
+++ b/engines/ultima/ultima8/world/super_sprite_process.cpp
@@ -362,7 +362,7 @@ void SuperSpriteProcess::hitAndFinish() {
 
 		if (ifx > 2 && ify > 2 && ifz > 2) {
 			int32 ixsize = (ifx - 2) * 16;
-			int32 iysize = (ifx - 2) * 16;
+			int32 iysize = (ify - 2) * 16;
 			if (pt.x < ix - ixsize)
 				pt.x = ix - ixsize;
 			if (pt.y < iy - iysize)


Commit: cc34d4ee638c640d628d88e7441f037e04a33575
    https://github.com/scummvm/scummvm/commit/cc34d4ee638c640d628d88e7441f037e04a33575
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-15T22:28:38+09:00

Commit Message:
ULTIMA8: Remove outdated comment

Changed paths:
    engines/ultima/ultima8/world/item.cpp


diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index c1015b030d2..24f59c79468 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -3252,8 +3252,6 @@ uint32 Item::I_getFootpadData(const uint8 *args, unsigned int /*argsize*/) {
 	ARG_UC_PTR(zptr);
 	if (!item) return 0;
 
-	// TODO: Data is packed differently in Crusader - check that this still works.
-
 	uint8 buf[2];
 	int32 x, y, z;
 	item->getFootpadData(x, y, z);