[Scummvm-cvs-logs] SF.net SVN: scummvm:[53039] scummvm/trunk

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Wed Oct 6 11:55:41 CEST 2010


Revision: 53039
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53039&view=rev
Author:   dreammaster
Date:     2010-10-06 09:55:41 +0000 (Wed, 06 Oct 2010)

Log Message:
-----------
LURE: Fix for #3062794 - Diermot cannot leave room 7

Modified Paths:
--------------
    scummvm/trunk/NEWS
    scummvm/trunk/engines/lure/hotspots.cpp

Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS	2010-10-05 21:23:04 UTC (rev 53038)
+++ scummvm/trunk/NEWS	2010-10-06 09:55:41 UTC (rev 53039)
@@ -103,6 +103,7 @@
    - Fixed bug where Goewin could get stuck in the Weregate
    - Fixed issue with Ratpouch repeatedly moving between two rooms
    - Fix for Goewin losing her schedule after Were-cave
+   - Fix for player getting stuck in sewer exit room
 
  Parallaction:
    - Made part one of The Big Red Adventure completable.

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2010-10-05 21:23:04 UTC (rev 53038)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2010-10-06 09:55:41 UTC (rev 53039)
@@ -3133,8 +3133,14 @@
 				const RoomTranslationRecord *p = &roomTranslations[0];
 				while ((p->srcRoom != 0) && (p->srcRoom != player->roomNumber()))
 					++p;
-				h.currentActions().addFront(DISPATCH_ACTION,
-					(p->srcRoom != 0) ? p->destRoom : player->roomNumber());
+
+				if (p->destRoom == h.roomNumber())
+					// Character is already in destination room, so set a random dest
+					h.setRandomDest();
+				else
+					// Move character to either the player's room, or found alternate destination
+					h.currentActions().addFront(DISPATCH_ACTION,
+						(p->srcRoom != 0) ? p->destRoom : player->roomNumber());
 			}
 		}
 	}


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




More information about the Scummvm-git-logs mailing list