[Scummvm-cvs-logs] scummvm master -> 42e395859f44f1082e392fd5db217750ffdcbbb9

[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:
42e395859f PEGASUS: Fix stopping Mercury scoring


Commit: 42e395859f44f1082e392fd5db217750ffdcbbb9
    https://github.com/scummvm/scummvm/commit/42e395859f44f1082e392fd5db217750ffdcbbb9
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-20T20:22:28-07:00

Commit Message:
PEGASUS: Fix stopping Mercury scoring

Thanks to Keith Kaisershot (blitter) for figuring it out

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



diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index e3a0eff..8e5f2e2 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -1910,6 +1910,7 @@ void WSC::receiveNotification(Notification *notification, const NotificationFlag
 					372 + kNavAreaLeft, 149 + kNavAreaTop));
 			setCurrentActivation(kActivationRobotDead);
 			GameState.setWSCRobotDead(true);
+			GameState.setScoringStoppedWSCRobot();
 
 			// Video is not present
 			//g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/WSC/XN59WD", false, kWarningInterruption);
@@ -1919,6 +1920,7 @@ void WSC::receiveNotification(Notification *notification, const NotificationFlag
 			_vm->addItemToInventory((InventoryItem *)item);
 			setCurrentActivation(kActivationRobotDead);
 			GameState.setWSCRobotDead(true);
+			GameState.setScoringStoppedWSCRobot();
 
 			// Video is not present
 			//g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/WSC/XN59WD", false, kWarningInterruption);