[Scummvm-git-logs] scummvm master -> 7f3ea3074f790f84971236cf012d7bb4bbfd7d27

[athrxx]

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:
7f3ea3074f SCUMM: (LOOM) - fix bug no. 13373 (Rusty's ghost can disappear completely)


Commit: 7f3ea3074f790f84971236cf012d7bb4bbfd7d27
    https://github.com/scummvm/scummvm/commit/7f3ea3074f790f84971236cf012d7bb4bbfd7d27
Author: athrxx (athrxx at scummvm.org)
Date: 2022-03-24T00:17:24+01:00

Commit Message:
SCUMM: (LOOM) - fix bug no. 13373 (Rusty's ghost can disappear completely)

This bug can only happen if Actor::setActorWalkSpeed() is called on a moving actor. But at least this is one such occasion...
The problem is that calcMovementFactor() gets called from common code here, so it has to be made virtual. Otherwise it will not call the correct version of the function for v3.

Changed paths:
    engines/scumm/actor.h


diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 703999355ad..f5ad06c0750 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -206,7 +206,7 @@ public:
 	void putActor(int x, int y, int room);
 	void setActorWalkSpeed(uint newSpeedX, uint newSpeedY);
 protected:
-	int calcMovementFactor(const Common::Point& next);
+	virtual int calcMovementFactor(const Common::Point& next);
 	int actorWalkStep();
 	int remapDirection(int dir, bool is_walking);
 	virtual void setupActorScale();
@@ -336,7 +336,7 @@ public:
 	void saveLoadWithSerializer(Common::Serializer &ser) override;
 
 protected:
-	int calcMovementFactor(const Common::Point& next);
+	int calcMovementFactor(const Common::Point& next) override;
 	int actorWalkStep();
 
 	void setupActorScale() override;