aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2014-04-13 09:54:52 -0400
committerMatthew Hoops2014-04-13 09:54:52 -0400
commit421aaa1a308ec5c038aa835022dd5a4b7e9d438b (patch)
tree0046a46ab501cdf7395c66bfb65c3ee7ab0e0ac0
parenta0e3b97bc0b2f2192df42a04c0d6d743763c8da9 (diff)
downloadscummvm-rg350-421aaa1a308ec5c038aa835022dd5a4b7e9d438b.tar.gz
scummvm-rg350-421aaa1a308ec5c038aa835022dd5a4b7e9d438b.tar.bz2
scummvm-rg350-421aaa1a308ec5c038aa835022dd5a4b7e9d438b.zip
PEGASUS: Fix entering the Mars shuttle with the shield biochip active
-rw-r--r--engines/pegasus/neighborhood/mars/mars.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 435bcd4c9e..a83b7802f5 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -535,6 +535,10 @@ void Mars::doorOpened() {
}
void Mars::setUpReactorEnergyDrain() {
+ // If there's no energy monitor, there's nothing to do
+ if (!g_energyMonitor)
+ return;
+
switch (GameState.getCurrentRoomAndView()) {
case MakeRoomView(kMars51, kEast):
if (GameState.isCurrentDoorOpen()) {