[Scummvm-git-logs] scummvm master -> 72773cf718642628e507bcc8d1838695c3f95ed2

OMGPizzaGuy noreply at scummvm.org
Fri Jun 7 12:33:33 UTC 2024


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:
72773cf718 Revert "ULTIMA8: Update fast area during item create from usecode."


Commit: 72773cf718642628e507bcc8d1838695c3f95ed2
    https://github.com/scummvm/scummvm/commit/72773cf718642628e507bcc8d1838695c3f95ed2
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-06-07T07:28:16-05:00

Commit Message:
Revert "ULTIMA8: Update fast area during item create from usecode."

This reverts commit 548c6e019dc145a230c505460e97be384c1ee533.

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 4302d99e0b3..7e2596bc30d 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -3184,14 +3184,8 @@ uint32 Item::I_legalCreateAtPoint(const uint8 *args, unsigned int /*argsize*/) {
 
 	World_FromUsecodeXY(x, y);
 
-	const ShapeInfo *si = GameData::get_instance()->getMainShapes()->getShapeInfo(shape);
-	int32 xd, yd, zd;
-	si->getFootpadWorld(xd, yd, zd, 0);
-
-	CurrentMap *cm = World::get_instance()->getCurrentMap();
-	cm->updateFastArea(x, y, z, x - xd, y - yd, z + zd);
-
 	// check if item can exist
+	CurrentMap *cm = World::get_instance()->getCurrentMap();
 	PositionInfo info = cm->getPositionInfo(x, y, z, shape, 0);
 	if (!info.valid)
 		return 0;
@@ -3222,14 +3216,8 @@ uint32 Item::I_legalCreateAtCoords(const uint8 *args, unsigned int /*argsize*/)
 
 	World_FromUsecodeXY(x, y);
 
-	const ShapeInfo *si = GameData::get_instance()->getMainShapes()->getShapeInfo(shape);
-	int32 xd, yd, zd;
-	si->getFootpadWorld(xd, yd, zd, 0);
-
-	CurrentMap *cm = World::get_instance()->getCurrentMap();
-	cm->updateFastArea(x, y, z, x - xd, y - yd, z + zd);
-
 	// check if item can exist
+	CurrentMap *cm = World::get_instance()->getCurrentMap();
 	PositionInfo info = cm->getPositionInfo(x, y, z, shape, 0);
 	if (!info.valid)
 		return 0;




More information about the Scummvm-git-logs mailing list