[Scummvm-cvs-logs] scummvm master -> 15456d333e9da3a2a6ed103487f2b1d004f1c5cc

[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:
15456d333e PEGASUS: Fix missing AI warning videos in the DVD demo


Commit: 15456d333e9da3a2a6ed103487f2b1d004f1c5cc
    https://github.com/scummvm/scummvm/commit/15456d333e9da3a2a6ed103487f2b1d004f1c5cc
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-07-21T05:58:24-07:00

Commit Message:
PEGASUS: Fix missing AI warning videos in the DVD demo

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



diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
index 38366c4..3116bd7 100644
--- a/engines/pegasus/neighborhood/neighborhood.cpp
+++ b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -1364,7 +1364,7 @@ void Neighborhood::setUpAIRules() {
 	if (g_AIArea) {
 		g_AIArea->forceAIUnlocked();
 
-		if (!_vm->isDemo() && (getObjectID() == kPrehistoricID || getObjectID() == kNoradAlphaID ||
+		if (!_vm->isOldDemo() && (getObjectID() == kPrehistoricID || getObjectID() == kNoradAlphaID ||
 				getObjectID() == kNoradDeltaID || getObjectID() == kMarsID || getObjectID() == kWSCID)) {
 
 			AIEnergyMonitorCondition *condition50 = new AIEnergyMonitorCondition(kWorriedEnergy);