[Scummvm-cvs-logs] scummvm master -> 37ebaa376311c6b033bc6043c09dfd88b3c80726

[bluegr]

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:
37ebaa3763 NEVERHOOD: Fix incorrect sound heard when pressing the ladder button


Commit: 37ebaa376311c6b033bc6043c09dfd88b3c80726
    https://github.com/scummvm/scummvm/commit/37ebaa376311c6b033bc6043c09dfd88b3c80726
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-07-08T20:28:41-07:00

Commit Message:
NEVERHOOD: Fix incorrect sound heard when pressing the ladder button

When the ladder is down, pressing the ladder button shouldn't do
anything

Changed paths:
    engines/neverhood/modules/module2800.cpp



diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index 7ab732b..a64bdc8 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -3140,7 +3140,7 @@ void Scene2822::update() {
 				_ssButton->setVisible(false);
 				_countdownStatus = 1;
 				_countdown = 48;
-			} else if (_countdownStatus == 1) {
+			} else if (_countdownStatus == 1 && getGlobalVar(V_LADDER_DOWN_ACTION)) {
 				playSound(0, 0x1384CB60);
 				_countdownStatus = 2;
 				_countdown = 12;