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

[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:
e25a292a83 ULTIMA8: Try to fix compile on older compilers


Commit: e25a292a83b71075db60e8c544c09b7a728cd760
    https://github.com/scummvm/scummvm/commit/e25a292a83b71075db60e8c544c09b7a728cd760
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-12-24T20:32:20+09:00

Commit Message:
ULTIMA8: Try to fix compile on older compilers

Changed paths:
    engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp


diff --git a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
index d76e1fd242..ab06a9d42f 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -305,8 +305,11 @@ void CruAvatarMoverProcess::step(Animation::Sequence action, Direction direction
 			int32 x = origpt.x + Direction_XFactor(testdir) * ADJUSTMENTS[i];
 			int32 y = origpt.y + Direction_YFactor(testdir) * ADJUSTMENTS[i];
 			int32 z = origpt.z;
+			// Note: we don't actually need the blocker output, just add the parameter
+			// for compilers that can't tell nullptr from 0..
+			const Item *blocker;
 			if (currentmap->isValidPosition(x, y, z, avatar->getShape(), avatar->getObjId(),
-											nullptr, nullptr, nullptr)) {
+											nullptr, nullptr, &blocker)) {
 				avatar->setLocation(x, y, z);
 				res = avatar->tryAnim(action, direction);
 				if (res == Animation::SUCCESS)