[Scummvm-cvs-logs] SF.net SVN: scummvm:[48814] scummvm/branches/branch-1-1-0

[dreammaster at users.sourceforge.net]

Revision: 48814
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48814&view=rev
Author:   dreammaster
Date:     2010-04-27 11:09:11 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
Backport of revisions 48812 and 48813 - Lure fixes for Goewin following player out of caves, and Shop-keeper handler

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/NEWS
    scummvm/branches/branch-1-1-0/engines/lure/hotspots.cpp
    scummvm/branches/branch-1-1-0/engines/lure/res.cpp

Modified: scummvm/branches/branch-1-1-0/NEWS
===================================================================
--- scummvm/branches/branch-1-1-0/NEWS	2010-04-27 11:00:43 UTC (rev 48813)
+++ scummvm/branches/branch-1-1-0/NEWS	2010-04-27 11:09:11 UTC (rev 48814)
@@ -16,6 +16,7 @@
    - Fixed several memory leaks.
    - Corrected problems in the handling of followers when blocked from performing
      actions by closed doors between rooms.
+   - Solved issues with Goewin not always correctly following the player out of the caves
 
  Tinsel:
    - Fix video playback regression in Discworld 2.

Modified: scummvm/branches/branch-1-1-0/engines/lure/hotspots.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/lure/hotspots.cpp	2010-04-27 11:00:43 UTC (rev 48813)
+++ scummvm/branches/branch-1-1-0/engines/lure/hotspots.cpp	2010-04-27 11:09:11 UTC (rev 48814)
@@ -3819,7 +3819,7 @@
 
 				if (h.hotspotId() == EWAN_ID) {
 					HotspotData *player = res.getHotspot(PLAYER_ID);
-					HotspotData *gwyn = res.getHotspot(GOEWIN_ID);
+					HotspotData *gwyn = res.getHotspot(GWEN_ID);
 					HotspotData *wayne = res.getHotspot(WAYNE_ID);
 
 					if ((player->roomNumber != 35) && (gwyn->roomNumber != 35) && (wayne->roomNumber != 35)) {

Modified: scummvm/branches/branch-1-1-0/engines/lure/res.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/lure/res.cpp	2010-04-27 11:00:43 UTC (rev 48813)
+++ scummvm/branches/branch-1-1-0/engines/lure/res.cpp	2010-04-27 11:09:11 UTC (rev 48814)
@@ -625,6 +625,11 @@
 				CharacterScheduleEntry *entry = resources.charSchedules().getEntry(res->npcScheduleId);
 				res->npcSchedule.addFront(DISPATCH_ACTION, entry, res->roomNumber);
 			}
+			if ((hotspotId == GOEWIN_ID) && (hotspot->roomNumber() == 39))
+				// WORKAROUND: When you re-join Goewin in the caves, clear her schedule. This may prevent a
+				// situation where you could close the left door, and she'd be permanently stuck trying to go
+				// the next room on the left, since her old schedule still had her following your old path
+				hotspot->currentActions().clear();
 
 			// TODO: Figure out why there's a room set in the animation decode for a range of characters,
 			// particularly since it doesn't seem to match what happens in-game


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.