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

FREESCAPE: workaround to make sure walls are enforced

Browse Source
This commit is contained in:
neuromancer 2022-12-08 09:18:58 +01:00
parent 2859ab0f44
commit 38959ebc26
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/freescape/movement.cpp
View File

@ -327,10 +327,20 @@ bool FreescapeEngine::checkCollisions(bool executeCode) {
Common::sort(objs.begin(), objs.end(), compareObjectsSizes);
uint16 areaID = _currentArea->getAreaID();
bool largeObjectWasBlocking = false;
for (auto &obj : objs) {
GeometricObject *gobj = (GeometricObject *)obj;
debugC(1, kFreescapeDebugMove, "Collided with object id %d of size %f %f %f", gobj->getObjectID(), gobj->getSize().x(), gobj->getSize().y(), gobj->getSize().z());
// The following check stops the player from going through big solid objects such as walls
// FIXME: find a better workaround of this
if (gobj->getSize().length() > 3000) {
if (largeObjectWasBlocking)
break;
largeObjectWasBlocking = true;
}
executeObjectConditions(gobj, false, true);
if (areaID != _currentArea->getAreaID())
break;
}