thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LURE: Bugfix for #3060480 - Ratpouch alternating between rooms

Browse source 
svn-id: r53026
This commit is contained in:
Paul Gilbert 2010-10-05 09:14:18 +00:00
parent 1161714d72
commit 61afea6cbe
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -94,6 +94,10 @@ For a more comprehensive changelog for the latest experimental SVN code, see:
- Implemented formerly missing recreation of some in game items. - Implemented formerly missing recreation of some in game items.
- Added support for playing Kyrandia 3 with the original CD file layout. - Added support for playing Kyrandia 3 with the original CD file layout.
LURE:
- Fixed bug where Goewin could get stuck in the Weregate
- Fixed issue with Ratpouch repeatedly moving between two rooms
Parallaction: Parallaction:
- Made part one of The Big Red Adventure completable. - Made part one of The Big Red Adventure completable.

6
engines/lure/hotspots.cpp
View file

@ -4032,12 +4032,14 @@ void HotspotTickHandlers::npcRoomChange(Hotspot &h) {
if (!h.currentActions().isEmpty()) { if (!h.currentActions().isEmpty()) {
if (h.startRoomNumber() != 0) { 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() || if (!h.currentActions().bottom().hasSupportData() ||
(h.currentActions().bottom().supportData().action() != RETURN)) { (h.currentActions().bottom().supportData().action() != RETURN)) {
// Start follower returning // Start follower returning
Hotspot *playerHotspot = res.getActiveHotspot(PLAYER_ID);
h.currentActions().clear(); h.currentActions().clear();
h.currentActions().addFront(RETURN, h.startRoomNumber(), 0, 0); h.currentActions().addFront(RETURN, playerHotspot->roomNumber(), 0, 0);
} }
} }