From f832487ce416e8156a8239f28100116566550e3f Mon Sep 17 00:00:00 2001 From: Joel Teichroeb Date: Fri, 7 Nov 2014 20:40:12 -0800 Subject: [PATCH] GRIM: Only check collision on setPos in EMI Fixes #1115 --- engines/grim/actor.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engines/grim/actor.cpp b/engines/grim/actor.cpp index 58f7bcd479b..34332412730 100644 --- a/engines/grim/actor.cpp +++ b/engines/grim/actor.cpp @@ -520,9 +520,11 @@ void Actor::setPos(const Math::Vector3d &position) { g_grim->getCurrSet()->findClosestSector(_pos, nullptr, &_pos); } - Math::Vector3d moveVec = position - _pos; - foreach (Actor *a, g_grim->getActiveActors()) { - handleCollisionWith(a, _collisionMode, &moveVec); + if (g_grim->getGameType() == GType_MONKEY4) { + Math::Vector3d moveVec = position - _pos; + foreach (Actor *a, g_grim->getActiveActors()) { + handleCollisionWith(a, _collisionMode, &moveVec); + } } }