[Scummvm-cvs-logs] SF.net SVN: scummvm:[48661] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 48661
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48661&view=rev
Author:   dreammaster
Date:     2010-04-16 10:00:49 +0000 (Fri, 16 Apr 2010)

Log Message:
-----------
Added code to de-activate town NPCs once the player makes it to the castle, since they're no longer needed

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/luredefs.h

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2010-04-15 21:45:03 UTC (rev 48660)
+++ scummvm/trunk/engines/lure/game.cpp	2010-04-16 10:00:49 UTC (rev 48661)
@@ -420,6 +420,7 @@
 
 void Game::displayBarrelAnimation() {
 	Mouse &mouse = Mouse::getReference();
+	Resources &res = Resources::getReference();
 
 	debugC(ERROR_INTERMEDIATE, kLureDebugAnimations, "Starting barrel animation");
 	Palette palette(BARREL_PALETTE_ID);
@@ -433,6 +434,16 @@
 
 	delete anim;
 
+	// Disable town NPCs that are no longer needed
+	res.deactivateHotspot(SKORL_ID);
+	res.deactivateHotspot(BLACKSMITH_ID);
+	res.deactivateHotspot(GWEN_ID);
+	res.deactivateHotspot(MALLIN_ID);
+	res.deactivateHotspot(MONK1_ID);
+	res.deactivateHotspot(GOEWIN_ID);
+	res.deactivateHotspot(MONK2_ID);
+	res.deactivateHotspot(WAYNE_ID);
+
 	Sound.killSounds();
 	mouse.cursorOn();
 }

Modified: scummvm/trunk/engines/lure/luredefs.h
===================================================================
--- scummvm/trunk/engines/lure/luredefs.h	2010-04-15 21:45:03 UTC (rev 48660)
+++ scummvm/trunk/engines/lure/luredefs.h	2010-04-16 10:00:49 UTC (rev 48661)
@@ -253,7 +253,11 @@
 #define RATPOUCH_ID 0x3E9
 #define SKORL_ID 0x3EA
 #define BLACKSMITH_ID 0x3EB
+#define GWEN_ID 0x3EC
+#define MALLIN_ID 0x3ED
+#define MONK1_ID 0x3EE
 #define GOEWIN_ID 0x3EF
+#define MONK2_ID 0x3F0
 #define WAYNE_ID 0x3f1
 #define CASTLE_SKORL_ID 0x3F3
 #define FIRST_NONCHARACTER_ID 0x408


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