diff options
| author | Paul Gilbert | 2010-10-05 09:14:18 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-10-05 09:14:18 +0000 |
| commit | 61afea6cbe527b0c4dedc587e1beb4568f7d379d (patch) | |
| tree | d541af7ac5fb043c412d10ee81f4188cfb09a0c4 /engines | |
| parent | 1161714d72efea6f283c166ed9492df9a6bbf755 (diff) | |
| download | scummvm-rg350-61afea6cbe527b0c4dedc587e1beb4568f7d379d.tar.gz scummvm-rg350-61afea6cbe527b0c4dedc587e1beb4568f7d379d.tar.bz2 scummvm-rg350-61afea6cbe527b0c4dedc587e1beb4568f7d379d.zip | |
LURE: Bugfix for #3060480 - Ratpouch alternating between rooms
svn-id: r53026
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lure/hotspots.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp index a84a84b51f..65a12981d8 100644 --- a/engines/lure/hotspots.cpp +++ b/engines/lure/hotspots.cpp @@ -4032,12 +4032,14 @@ void HotspotTickHandlers::npcRoomChange(Hotspot &h) { if (!h.currentActions().isEmpty()) { if (h.startRoomNumber() != 0) { - // If character isn't already returning to starting room, start them doing so + // If character isn't already returning to starting room, redirect them to the + // player's current room if (!h.currentActions().bottom().hasSupportData() || (h.currentActions().bottom().supportData().action() != RETURN)) { // Start follower returning + Hotspot *playerHotspot = res.getActiveHotspot(PLAYER_ID); h.currentActions().clear(); - h.currentActions().addFront(RETURN, h.startRoomNumber(), 0, 0); + h.currentActions().addFront(RETURN, playerHotspot->roomNumber(), 0, 0); } } |