[Scummvm-cvs-logs] scummvm master -> 004592e51059de7e1f562629ad676de726fc7307

[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:
004592e510 TSAGE: R2R - Remove a hack in Scene1337::Action12


Commit: 004592e51059de7e1f562629ad676de726fc7307
    https://github.com/scummvm/scummvm/commit/004592e51059de7e1f562629ad676de726fc7307
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-13T08:02:21+02:00

Commit Message:
TSAGE: R2R - Remove a hack in Scene1337::Action12

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 6a77430c..778b190 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4106,7 +4106,7 @@ void Scene1337::Action11::signal() {
 		}
 
 		if (!noAction)
-			return;
+			break;
 
 		if (scene->_actionPlayerIdx == 2) {
 			int count = 0;
@@ -4378,7 +4378,6 @@ void Scene1337::Action12::signal() {
 			break;
 		}
 		scene->discardCard(scene->_actionCard2);
-		scene->handleNextTurn();
 		break;
 	default:
 		break;