From 421aaa1a308ec5c038aa835022dd5a4b7e9d438b Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 13 Apr 2014 09:54:52 -0400
Subject: PEGASUS: Fix entering the Mars shuttle with the shield biochip active

---
 engines/pegasus/neighborhood/mars/mars.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines/pegasus/neighborhood')

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()) {
-- 
cgit v1.2.3