aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/lure/game.cpp11
-rw-r--r--engines/lure/luredefs.h4
2 files changed, 15 insertions, 0 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index 49a100346e..d0f98b9c34 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -420,6 +420,7 @@ void Game::displayChuteAnimation() {
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 @@ void Game::displayBarrelAnimation() {
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();
}
diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h
index 922e1207d0..b13c4a0724 100644
--- a/engines/lure/luredefs.h
+++ b/engines/lure/luredefs.h
@@ -253,7 +253,11 @@ enum CursorType {CURSOR_ARROW = 0, CURSOR_DISK = 1, CURSOR_TIME_START = 2,
#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