libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-15 16:58:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Only check collision on setPos in EMI

Browse Source 
Fixes #1115
This commit is contained in:
Joel Teichroeb 2014-11-07 20:40:12 -08:00
parent c1f79333f7
commit f832487ce4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/grim/actor.cpp
View File

@ -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);
}
}
}