[Scummvm-cvs-logs] scummvm master -> 2003a4a2b4f745b0b4ff3fe7e9ff17600b43eeab

[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:
2003a4a2b4 TSAGE: R2R - Fix a bug in scene 1337


Commit: 2003a4a2b4f745b0b4ff3fe7e9ff17600b43eeab
    https://github.com/scummvm/scummvm/commit/2003a4a2b4f745b0b4ff3fe7e9ff17600b43eeab
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-09T21:37:26+02:00

Commit Message:
TSAGE: R2R - Fix a bug in scene 1337

The bug was a rare skip of turn when playing a counter-attack card. Removing the call to handleNextTurn was introducing a
bug related to the cursor caching as well as an even rarer
eternal loop.

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 e29f336..591ed30 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5095,7 +5095,12 @@ void Scene1337::playAntiDelayCard(Card *card, Card *dest) {
 
 	_actionItem.setAction(&_action8);
 
-	handleNextTurn();
+	// WORKAROUND: Restore the default cursor and for a call to signal.
+	// This works around the cursor caching we got rid of, and avoid
+	// the game ends in an eternal loop when a player reacts to another player
+	// attack.
+	setCursorData(5, 1, 4);
+	signal();
 }