[Scummvm-cvs-logs] scummvm master -> 3a5554f7ba2af3aba2cfa28b7a0c95242334737a

[digitall]

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:
3a5554f7ba TUCKER: Fix bug #6381 - "TUCKER: In 3rd part, "Use Peg" fails..."


Commit: 3a5554f7ba2af3aba2cfa28b7a0c95242334737a
    https://github.com/scummvm/scummvm/commit/3a5554f7ba2af3aba2cfa28b7a0c95242334737a
Author: dergunov (alexander.dergunov at gmail.com)
Date: 2014-02-10T06:48:50-08:00

Commit Message:
TUCKER: Fix bug #6381 - "TUCKER: In 3rd part, "Use Peg" fails..."

"Use Peg" is a single-item action and these are hardcoded in the
engine. The default otherwise is dual-item action "Use X on Y".

Changed paths:
    engines/tucker/tucker.cpp



diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 04e83ef..d443cd3 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -3682,7 +3682,8 @@ void TuckerEngine::setActionForInventoryObject() {
 		_actionRequiresTwoObjects = false;
 		return;
 	}
-	if ((_partNum == 3 && (_actionObj1Num == 6 || _actionObj1Num == 3 || _actionObj1Num == 17)) ||
+	// Items with unary usage i.e. "Use X", rather than "Use X on Y"
+	if ((_partNum == 3 && (_actionObj1Num == 6 || _actionObj1Num == 3 || _actionObj1Num == 17 || _actionObj1Num == 33)) ||
 		(_partNum == 2 && _actionObj1Num == 19) ||
 		(_partNum == 3 && (_actionObj1Num == 42 && _selectedObjectNum == 18)) ) {
 		_actionVerbLocked = 0;