[Scummvm-cvs-logs] scummvm master -> 141695b43b9e12ccb95d215918bd957a1446b93f
Strangerke
Strangerke at scummvm.org
Sat Dec 21 01:06:40 CET 2013
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:
141695b43b TSAGE: R2R - Fix discard behavior for player 2 in scene 1337
Commit: 141695b43b9e12ccb95d215918bd957a1446b93f
https://github.com/scummvm/scummvm/commit/141695b43b9e12ccb95d215918bd957a1446b93f
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-20T16:05:49-08:00
Commit Message:
TSAGE: R2R - Fix discard behavior for player 2 in scene 1337
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 26b423f..bb5f372 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6336,6 +6336,7 @@ void Scene1337::handlePlayer2() {
if (!found) {
if (_discardPile.isIn(Common::Point(_selectedCard._stationPos.x + 12, _selectedCard._stationPos.y + 12))) {
discardCard(&_selectedCard);
+ return;
} else {
if (_selectedCard._cardId == 1) {
bool isInCardFl = false;
More information about the Scummvm-git-logs
mailing list