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

[Strangerke]

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:
bf42ad7054 TSAGE: R2R - Fix an original bug in card game logic


Commit: bf42ad705499b37bc849ffaaff7ecbaa0654b3d9
    https://github.com/scummvm/scummvm/commit/bf42ad705499b37bc849ffaaff7ecbaa0654b3d9
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-11T23:09:37-08:00

Commit Message:
TSAGE: R2R - Fix an original bug in card game logic

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 69e25f7..d117bbe 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4149,6 +4149,7 @@ void Scene1337::Action11::signal() {
 	}
 }
 
+// Pick a card in opponent hand
 void Scene1337::Action12::signal() {
 	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
 
@@ -4185,7 +4186,8 @@ void Scene1337::Action12::signal() {
 				break;
 			case 1:
 				for (i = 0; i <= 3; i++) {
-					if (scene->_gameBoardSide[3]._handCard[i]._cardId != 0)
+					// The original game was counting in the hand of player 3, which is obviously wrong
+					if (scene->_gameBoardSide[1]._handCard[i]._cardId != 0)
 						++count;
 				}
 				break;