libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix for player blocking room entrance causing NPCs trying to enter getting an excessive number of action entries

Browse Source 
svn-id: r42676
This commit is contained in:
Paul Gilbert 2009-07-23 10:49:30 +00:00
parent c8d7b677f8
commit 53783575d8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/lure/hotspots.cpp
View File

@ -2691,7 +2691,19 @@ void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) {
return;
}
h.currentActions().top().setAction(WALKING);
h.setPosition(h.x(), h.y() & 0xfff8);
// WORKAROUND: A character that had enteredg an exit area might have been blocked from entering the new room.
// The Y position adjust below could thus place a character further into the exit area. So don't do the
// position adjustment if the user is already in an exit area
int16 x = h.x() + (h.widthCopy() >> 1);
int16 y = h.y() + h.heightCopy() - (h.yCorrection() >> 1);
RoomData *roomData = Resources::getReference().getRoom(h.roomNumber());
RoomExitData *exitRec = roomData->exits.checkExits(x, y);
if (!exitRec)
h.setPosition(h.x(), h.y() & 0xfff8);
} else if (h.blockedState() == BS_FINAL) {
// If this point is reached, the character twice hasn't found a walking path
debugC(ERROR_DETAILED, kLureDebugAnimations, "Character is hopelessly blocked");