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

aquadran noreply at scummvm.org
Sat Jun 25 22:37:22 UTC 2022


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:
d2e84cc61a WINTERMUTE: WME3D: Restore original 'if' condition and fixed ported condition to match original


Commit: d2e84cc61a4a03e653eb1733cdc883c889c2ec99
    https://github.com/scummvm/scummvm/commit/d2e84cc61a4a03e653eb1733cdc883c889c2ec99
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-26T00:37:18+02:00

Commit Message:
WINTERMUTE: WME3D: Restore original 'if' condition and fixed ported condition to match original

Changed paths:
    engines/wintermute/ad/ad_actor_3dx.cpp


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 5a6d1bb5d84..4af0315dab7 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -157,8 +157,10 @@ bool AdActor3DX::update() {
 			_nextState = STATE_READY;
 		} else {
 			// set animation
-			if (_directTurnMode != DIRECT_TURN_NONE) {
-				if (_directTurnAnim.empty()) {
+			if (_directWalkMode != DIRECT_WALK_NONE) {
+				// disabled in original code
+			} else if (_directTurnMode != DIRECT_TURN_NONE) {
+				if (!_directTurnAnim.empty()) {
 					_modelX->playAnim(0, _directTurnAnim, _defaultTransTime, false, _defaultStopTransTime);
 				} else {
 					_modelX->playAnim(0, _idleAnimName, _defaultTransTime, false, _defaultStopTransTime);




More information about the Scummvm-git-logs mailing list