Merged the FSNode branch with trunk r27031:27680

svn-id: r27681

1 files changed, 14 insertions, 4 deletions

diff --git a/engines/lure/scripts.h b/engines/lure/scripts.h
index b0cda0b74b..1191017d11 100644
--- a/engines/lure/scripts.h
+++ b/engines/lure/scripts.h
@@ -79,18 +79,22 @@ public:
 
 	static void activateHotspot(uint16 hotspotId, uint16 v2, uint16 v3);
 	static void setHotspotScript(uint16 hotspotId, uint16 scriptIndex, uint16 v3);
-	static void method2(uint16 v1, uint16 v2, uint16 v3);
+	static void addSound2(uint16 v1, uint16 v2, uint16 v3);
 	static void setHotspotFlagMask(uint16 maskVal, uint16 v2, uint16 v3);
 	static void clearSequenceDelayList(uint16 v1, uint16 scriptIndex, uint16 v3);
 	static void deactivateHotspotSet(uint16 listIndex, uint16 v2, uint16 v3);
 	static void deactivateHotspot(uint16 hotspotId, uint16 v2, uint16 v3);
 	static void resetPathfinder(uint16 v1, uint16 v2, uint16 v3);
 	static void addDelayedSequence(uint16 seqOffset, uint16 delay, uint16 canClear);
+	static void killSound(uint16 soundId, uint16 v2, uint16 v3);
 	static void characterInRoom(uint16 characterId, uint16 roomNumber, uint16 v3);
 	static void setDesc(uint16 hotspotId, uint16 descId, uint16 v3);
 	static void setHotspotName(uint16 hotspotId, uint16 nameId, uint16 v3);
-	static void playSound(uint16 v1, uint16 v2, uint16 v3);
+	static void addSound(uint16 soundId, uint16 v2, uint16 v3);
+	static void endgameSequence(uint16 v1, uint16 v2, uint16 v3);
+	static void setupPigFight(uint16 v1, uint16 v2, uint16 v3);
 	static void displayDialog(uint16 stringId, uint16 v2, uint16 v3);
+	static void setupSkorlFight(uint16 v1, uint16 v2, uint16 v3);
 	static void remoteRoomViewSetup(uint16 v1, uint16 v2, uint16 v3);
 	static void startSpeakingToNoone(uint16 characterId, uint16 stringId, uint16 v3);
 	static void playMusic(uint16 musicNum, uint16 v2, uint16 v3);
@@ -112,27 +116,33 @@ public:
 	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 checkDroppedDesc(uint16 hotspotId, 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);
+	static void fixGoewin(uint16 v1, uint16 v2, uint16 v3);
 	static void displayMessage(uint16 messageId, uint16 characterId, uint16 unknownVal);
 	static void doorOpen(uint16 hotspotId, uint16 v2, uint16 v3);
 	static void npcWait(uint16 hotspotId, uint16 v2, uint16 v3);
+	static void checkWakeBrenda(uint16 v1, uint16 v2, uint16 v3);
 	static void setNewSupportData(uint16 hotspotId, uint16 index, uint16 v3);
 	static void setSupportData(uint16 hotspotId, uint16 index, uint16 v3);
 	static void givePlayerItem(uint16 hotspotId, uint16 v2, uint16 v3);
 	static void decreaseNumGroats(uint16 characterId, uint16 numGroats, uint16 v3);
+	static void makeGoewinWork(uint16 v1, uint16 v2, uint16 v3);
 	static void moveCharacterToPlayer(uint16 characterId, uint16 v2, uint16 v3);
 	static void setVillageSkorlTickProc(uint16 v1, uint16 v2, uint16 v3);
 	static void freeGoewin(uint16 v1, uint16 v2, uint16 v3);
 	static void barmanServe(uint16 v1, uint16 v2, uint16 v3);
 	static void getNumGroats(uint16 v1, uint16 v2, uint16 v3);
+	static void checkHasBook(uint16 v1, uint16 v2, uint16 v3);
 	static void enableGargoylesTalk(uint16 v1, uint16 v2, uint16 v3);
 	static void killPlayer(uint16 v1, uint16 v2, uint16 v3);
+	static void normalGoewin(uint16 v1, uint16 v2, uint16 v3);
 	static void animationLoad(uint16 hotspotId, uint16 v2, uint16 v3);
 	static void addActions(uint16 hotspotId, uint16 actions, uint16 v3);
 	static void randomToGeneral(uint16 maxVal, uint16 minVal, uint16 v3);
 	static void checkCellDoor(uint16 v1, uint16 v2, uint16 v3);
-	static void method66(uint16 v1, uint16 v2, uint16 v3);
+	static void checkSound(uint16 v1, uint16 v2, uint16 v3);
 };
 
 class HotspotScript {