aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/neighborhood
diff options
context:
space:
mode:
authorMatthew Hoops2011-12-13 21:02:28 -0500
committerMatthew Hoops2011-12-13 21:02:28 -0500
commita328f32fed85743f85b26876b9ade388d4eb0bbd (patch)
tree7d488249f2119a3987c8299d92a43b50bdcf6c09 /engines/pegasus/neighborhood
parentd55aeeec0b386966a194776f22434ad0bb81da4c (diff)
downloadscummvm-rg350-a328f32fed85743f85b26876b9ade388d4eb0bbd.tar.gz
scummvm-rg350-a328f32fed85743f85b26876b9ade388d4eb0bbd.tar.bz2
scummvm-rg350-a328f32fed85743f85b26876b9ade388d4eb0bbd.zip
PEGASUS: Fix going from bomb game to the end game
The game is now completable from after completing from a save that has Norad complete.
Diffstat (limited to 'engines/pegasus/neighborhood')
-rwxr-xr-xengines/pegasus/neighborhood/caldoria/caldoriabomb.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
index 43de5e73e6..9ec3124251 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
@@ -1209,6 +1209,15 @@ void CaldoriaBomb::closeInteraction() {
_timer.stopDisplaying();
_grid.hide();
_grid.stopDisplaying();
+
+ // The original did not do this, but we need it here
+ // Not sure why the original worked without this; probably
+ // related to the way the List code worked in CodeWarrior.
+ // If this is not here, the notifications will later attempt
+ // to remove itself from this receiver causing a very nasty
+ // crash.
+ _timerNotification.cancelNotification(this);
+ _neighborhoodNotification->cancelNotification(this);
}
void CaldoriaBomb::startBombAmbient(Common::String ambient) {