aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2016-01-31 01:24:09 +0100
committerMartin Kiewitz2016-01-31 01:24:09 +0100
commit4afda5bbea086dff5f9e90c6d49f5fa017dd92d2 (patch)
treeb807d7042d10266974a64e30e03e53cb2d8a87b7
parent428df3e6cb1e3d37c6b596ecd7049c1430905667 (diff)
downloadscummvm-rg350-4afda5bbea086dff5f9e90c6d49f5fa017dd92d2.tar.gz
scummvm-rg350-4afda5bbea086dff5f9e90c6d49f5fa017dd92d2.tar.bz2
scummvm-rg350-4afda5bbea086dff5f9e90c6d49f5fa017dd92d2.zip
AGI: motion type check in objectstop was AGI3 only
verified via disassembly
-rw-r--r--engines/agi/motion.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/agi/motion.cpp b/engines/agi/motion.cpp
index 4af8a48518..a7a1b91788 100644
--- a/engines/agi/motion.cpp
+++ b/engines/agi/motion.cpp
@@ -209,7 +209,14 @@ void AgiEngine::inDestination(ScreenObjEntry *screenObj) {
void AgiEngine::motionMoveObjStop(ScreenObjEntry *screenObj) {
screenObj->stepSize = screenObj->move_stepSize;
- if (screenObj->motionType != kMotionEgo) {
+
+ uint16 agiVersion = getVersion();
+ if (agiVersion >= 0x3000) {
+ // this check was only done for AGI3
+ if (screenObj->motionType != kMotionEgo) {
+ setflag(screenObj->move_flag, true);
+ }
+ } else {
setflag(screenObj->move_flag, true);
}