[Scummvm-cvs-logs] scummvm master -> e0e7790dfb4f86936b297a8479c71d4eb456e46b

[bgK]

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:
e0e7790dfb MOHAWK: Fix the getter for Channelwood's var 32


Commit: e0e7790dfb4f86936b297a8479c71d4eb456e46b
    https://github.com/scummvm/scummvm/commit/e0e7790dfb4f86936b297a8479c71d4eb456e46b
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-01-13T19:22:06+01:00

Commit Message:
MOHAWK: Fix the getter for Channelwood's var 32

Changed paths:
    engines/mohawk/myst_stacks/channelwood.cpp



diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp
index dfa15a9..0718f8e 100644
--- a/engines/mohawk/myst_stacks/channelwood.cpp
+++ b/engines/mohawk/myst_stacks/channelwood.cpp
@@ -170,7 +170,10 @@ uint16 Channelwood::getVar(uint16 var) {
 
 		return 0;
 	case 32: // Sound - Water Flowing in Pipe to Book Room Elevator
-		return ((_state.waterValveStates & 0xf8) == 0xb0 && _state.pipeState) ? 1 : 0;
+		if ((_state.waterValveStates & 0xf8) == 0xb0)
+			return _state.pipeState ? 2 : 1;
+
+		return 0;
 	case 33: // Channelwood Lower Walkway to Upper Walkway Spiral Stair Upper Door State
 		if (_state.stairsUpperDoorState) {
 			if (_tempVar == 1)