[Scummvm-cvs-logs] scummvm master -> 421aaa1a308ec5c038aa835022dd5a4b7e9d438b

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
421aaa1a30 PEGASUS: Fix entering the Mars shuttle with the shield biochip active


Commit: 421aaa1a308ec5c038aa835022dd5a4b7e9d438b
    https://github.com/scummvm/scummvm/commit/421aaa1a308ec5c038aa835022dd5a4b7e9d438b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-04-13T09:54:52-04:00

Commit Message:
PEGASUS: Fix entering the Mars shuttle with the shield biochip active

Changed paths:
    engines/pegasus/neighborhood/mars/mars.cpp



diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 435bcd4..a83b780 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()) {