[Scummvm-cvs-logs] SF.net SVN: scummvm: [30529] scummvm/branches/branch-0-11-0/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 30529
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30529&view=rev
Author:   dreammaster
Date:     2008-01-17 03:05:19 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Backport of fix for correctly moving to Goewin to interact with her

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/lure/scripts.cpp
    scummvm/branches/branch-0-11-0/engines/lure/scripts.h

Modified: scummvm/branches/branch-0-11-0/engines/lure/scripts.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/scripts.cpp	2008-01-17 11:00:36 UTC (rev 30528)
+++ scummvm/branches/branch-0-11-0/engines/lure/scripts.cpp	2008-01-17 11:05:19 UTC (rev 30529)
@@ -443,9 +443,9 @@
 	activeHotspot->setHotspotScript(0x630);
 }
 
-// Marks the jail door in room 14 for closing
+// Marks the town hall door in room 14 for closing
 
-void Script::jailClose(uint16 v1, uint16 v2, uint16 v3) {
+void Script::townHallClose(uint16 v1, uint16 v2, uint16 v3) {
 	RoomExitJoinData *joinRec = Resources::getReference().getExitJoin(0x2719);
 	joinRec->blocked = 1;
 }
@@ -603,6 +603,10 @@
 	goewin->setHotspotScript(0x616);
 	goewin->setDelayCtr(1500);
 	goewin->setTickProc(GOEWIN_SHOP_TICK_PROC);
+
+	// Set walk to position for Goewin whilst she's working
+	goewin->resource()->walkX = 179;
+	goewin->resource()->walkY = 138;
 }
 
 // Sets a character moving to the player's room (if they're not already there)
@@ -700,6 +704,10 @@
 	hotspot->setCharacterMode(CHARMODE_NONE);
 	hotspot->setDirection(UP);
 	hotspot->setTickProc(STANDARD_CHARACTER_TICK_PROC);
+
+	// Clear walk to position for Goewin so player must walk up to her when interacting
+	hotspot->resource()->walkX = 0;
+	hotspot->resource()->walkY = 0;
 }
 
 // Flags the player as dead
@@ -798,7 +806,7 @@
 	{36, Script::displayMessage2},
 	{37, Script::startOilBurner},
 	{38, Script::transformPlayer},
-	{39, Script::jailClose},
+	{39, Script::townHallClose},
 	{40, Script::checkRoomNumber},
 	{41, Script::makeGoewinFollow},
 	{42, Script::doorClose},

Modified: scummvm/branches/branch-0-11-0/engines/lure/scripts.h
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/scripts.h	2008-01-17 11:00:36 UTC (rev 30528)
+++ scummvm/branches/branch-0-11-0/engines/lure/scripts.h	2008-01-17 11:05:19 UTC (rev 30529)
@@ -115,7 +115,7 @@
 	static void displayMessage2(uint16 messageId, uint16 hotspotId, uint16 v3);
 	static void startOilBurner(uint16 v1, uint16 v2, uint16 v3);
 	static void transformPlayer(uint16 v1, uint16 v2, uint16 v3);
-	static void jailClose(uint16 v1, uint16 v2, uint16 v3);
+	static void townHallClose(uint16 v1, uint16 v2, uint16 v3);
 	static void checkRoomNumber(uint16 hotspotId, uint16 roomNumber, uint16 v3);
 	static void makeGoewinFollow(uint16 v1, uint16 v2, uint16 v3);
 	static void doorClose(uint16 hotspotId, uint16 v2, uint16 v3);


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