[Scummvm-cvs-logs] scummvm master -> 9a1bdfbd0838fd895cac445f051b109914f51f73

[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:
9a1bdfbd08 PEGASUS: Fixed claw scoring time


Commit: 9a1bdfbd0838fd895cac445f051b109914f51f73
    https://github.com/scummvm/scummvm/commit/9a1bdfbd0838fd895cac445f051b109914f51f73
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-22T10:26:36-07:00

Commit Message:
PEGASUS: Fixed claw scoring time

It should be set when actually using the claw instead of just looking at the sub control monitors.

Thanks to Keith Kaisershot (blitter) for spotting

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



diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
index 2b15ad4..55d7562 100644
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
@@ -541,8 +541,6 @@ void SubControlRoom::initInteraction() {
 
 	_subControlMovie.redrawMovieWorld();
 	_clawMonitorMovie.redrawMovieWorld();
-
-	GameState.setScoringPlayedWithClaw(true);
 }									
 
 void SubControlRoom::closeInteraction() {
@@ -833,6 +831,8 @@ void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) {
 }
 
 void SubControlRoom::dispatchClawAction(const int newAction) {
+	GameState.setScoringPlayedWithClaw(true);
+
 	Neighborhood *owner = getOwner();
 
 	if (newAction == kNoActionIndex) {