aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2
diff options
context:
space:
mode:
authorStrangerke2013-12-03 08:17:59 +0100
committerStrangerke2013-12-03 08:17:59 +0100
commit441063508d11c30baca53199daa0d7b8f8bd90b0 (patch)
treef329c29fdbbbb802faf2ec05fb25257cf9c9d215 /engines/tsage/ringworld2
parent469c7c0b8cbfd06bfdae6010bd431834657b977f (diff)
downloadscummvm-rg350-441063508d11c30baca53199daa0d7b8f8bd90b0.tar.gz
scummvm-rg350-441063508d11c30baca53199daa0d7b8f8bd90b0.tar.bz2
scummvm-rg350-441063508d11c30baca53199daa0d7b8f8bd90b0.zip
TSAGE: R2R - Fix bug in scene 1337, some renaming and comments
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp13
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 55aa6dce3e..ed3eb213b0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -3091,6 +3091,9 @@ void Scene1337::Action2::signal() {
}
}
+/**
+ * Deal cards
+ */
void Scene1337::Action3::signal() {
Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
@@ -3366,7 +3369,7 @@ void Scene1337::Action4::signal() {
case 0:
if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayCard._cardId))) {
if (scene->_cardsAvailableNumb < 0)
- scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayCard._cardId);
+ scene->shuffleCards();
scene->_animatedCard._card.setPosition(Common::Point(162, 95), 0);
scene->_animatedCard._card.show();
scene->_aSound2.play(61);
@@ -5544,7 +5547,7 @@ void Scene1337::suggestInstructions() {
if (MessageDialog::show(NEED_INSTRUCTIONS, NO_MSG, YES_MSG) == 0) {
if (R2_GLOBALS._v57709 == 0)
subD18F5();
- firstShuffle();
+ dealCards();
} else {
if (R2_GLOBALS._v57709 == 0)
subD18F5();
@@ -5591,6 +5594,8 @@ void Scene1337::shuffleCards() {
}
_shuffleEndedFl = false;
+
+ // Shuffle cards
_animatedCard._card.setAction(&_action2);
while(!_shuffleEndedFl && !g_vm->shouldQuit()) {
@@ -5601,9 +5606,11 @@ void Scene1337::shuffleCards() {
}
}
-void Scene1337::firstShuffle() {
+void Scene1337::dealCards() {
_animatedCard._card._moveDiff = Common::Point(30, 30);
shuffleCards();
+
+ // Deal cards
_item1.setAction(&_action3);
}
void Scene1337::subCD193() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 1653e40b10..582295523b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -362,7 +362,7 @@ public:
void displayInstructions();
void suggestInstructions();
void shuffleCards();
- void firstShuffle();
+ void dealCards();
void subCD193();
void subCDB90(int arg1, Common::Point pt);
void subCF31D();