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

[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:
ec02b4e7b1 ULTIMA8: Small constness improvements
dbce998d04 ULTIMA8: Put back ARG_NULL8 macro with fix


Commit: ec02b4e7b1694659648601c5686dc730c6f8d624
    https://github.com/scummvm/scummvm/commit/ec02b4e7b1694659648601c5686dc730c6f8d624
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-23T07:41:08+09:00

Commit Message:
ULTIMA8: Small constness improvements

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 b0e7cffa7e..88da3477e8 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1302,7 +1302,7 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
 		SuperSpriteProcess *ssp;
 		CrosshairProcess *chp = CrosshairProcess::get_instance();
 		assert(chp);
-		Item *crosshair = getItem(chp->getItemNum());
+		const Item *crosshair = getItem(chp->getItemNum());
 		int32 ssx, ssy, ssz;
 		if (tx != -1) {
 			// Shoot toward the target
@@ -1402,7 +1402,7 @@ uint16 Item::fireDistance(const Item *other, Direction dir, int16 xoff, int16 yo
 
 	int32 dist = 0;
 
-	CurrentMap *cm = World::get_instance()->getCurrentMap();
+	const CurrentMap *cm = World::get_instance()->getCurrentMap();
 	if (!cm)
 		return 0;
 
@@ -1475,7 +1475,7 @@ int32 Item::getTargetZRelativeToAttackerZ(int32 otherz) const {
 
 
 unsigned int Item::countNearby(uint32 shape, uint16 range) {
-	CurrentMap *currentmap = World::get_instance()->getCurrentMap();
+	const CurrentMap *currentmap = World::get_instance()->getCurrentMap();
 	UCList itemlist(2);
 	LOOPSCRIPT(script, LS_SHAPE_EQUAL(shape));
 	currentmap->areaSearch(&itemlist, script, sizeof(script),


Commit: dbce998d04403de0e164f0bca23d836ffa8d6b4c
    https://github.com/scummvm/scummvm/commit/dbce998d04403de0e164f0bca23d836ffa8d6b4c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-09-23T07:41:08+09:00

Commit Message:
ULTIMA8: Put back ARG_NULL8 macro with fix

Removed this macro in dc17170 because it had one usage and was wrong anyway,
but it's nice to avoid the unused variable warning.

Changed paths:
    engines/ultima/ultima8/usecode/intrinsics.h
    engines/ultima/ultima8/world/item.cpp


diff --git a/engines/ultima/ultima8/usecode/intrinsics.h b/engines/ultima/ultima8/usecode/intrinsics.h
index 644fdbad36..3049d8a0f8 100644
--- a/engines/ultima/ultima8/usecode/intrinsics.h
+++ b/engines/ultima/ultima8/usecode/intrinsics.h
@@ -90,6 +90,8 @@ typedef uint32(*Intrinsic)(const uint8 *args, unsigned int argsize);
 	WorldPoint x; \
 	UCMachine::get_instance()->dereferencePointer(ucptr_##x, x._buf, 5);
 
+// See comment on ARG_UINT8 for why +2 on NULL8
+#define ARG_NULL8()  args+=2;
 #define ARG_NULL16() args+=2;
 #define ARG_NULL32() args+=4;
 
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 88da3477e8..5be5990eee 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -3881,7 +3881,7 @@ uint32 Item::I_explode(const uint8 *args, unsigned int argsize) {
 uint32 Item::I_igniteChaos(const uint8 *args, unsigned int /*argsize*/) {
 	ARG_UINT16(x);
 	ARG_UINT16(y);
-	ARG_UINT8(z); // unused
+	ARG_NULL8(); // z, unused
 
 	assert(GAME_IS_U8);