[Scummvm-cvs-logs] scummvm master -> 178db404d0793943d2fcb118c812f8c1447c9711

Strangerke Strangerke at scummvm.org
Tue Dec 3 07:50:26 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:
178db404d0 TSAGE: R2R - Fix a bug in scene 1337, some renaming


Commit: 178db404d0793943d2fcb118c812f8c1447c9711
    https://github.com/scummvm/scummvm/commit/178db404d0793943d2fcb118c812f8c1447c9711
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-02T22:49:15-08:00

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

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 08711d0..fc89d99 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2654,10 +2654,10 @@ void Scene1337::Action1::signal() {
 		waitFrames(60);
 		scene->actionDisplay(1331, 14, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 
-		scene->_gameBoardSide[2]._delayPile._card.postInit();
-		scene->_gameBoardSide[2]._delayPile._card.setVisage(1332);
-		scene->_gameBoardSide[2]._delayPile._card.setPosition(scene->_gameBoardSide[2]._delayPile._stationPos, 0);
-		scene->_gameBoardSide[2]._delayPile._card.hide();
+		scene->_gameBoardSide[2]._delayCard._card.postInit();
+		scene->_gameBoardSide[2]._delayCard._card.setVisage(1332);
+		scene->_gameBoardSide[2]._delayCard._card.setPosition(scene->_gameBoardSide[2]._delayCard._stationPos, 0);
+		scene->_gameBoardSide[2]._delayCard._card.hide();
 
 		scene->_gameBoardSide[3]._handCard[2]._cardId = 0;
 		scene->_gameBoardSide[3]._handCard[2].remove();
@@ -2666,13 +2666,13 @@ void Scene1337::Action1::signal() {
 		scene->_animatedCard._card.show();
 
 		NpcMover *mover = new NpcMover();
-		scene->_animatedCard._card.addMover(mover, &scene->_gameBoardSide[2]._delayPile._stationPos, this);
+		scene->_animatedCard._card.addMover(mover, &scene->_gameBoardSide[2]._delayCard._stationPos, this);
 		}
 		break;
 	case 6: {
 		scene->_animatedCard._card.hide();
-		scene->_gameBoardSide[2]._delayPile._cardId = 21;
-		scene->setAnimationInfo(&scene->_gameBoardSide[2]._delayPile);
+		scene->_gameBoardSide[2]._delayCard._cardId = 21;
+		scene->setAnimationInfo(&scene->_gameBoardSide[2]._delayCard);
 		scene->_aSound1.play(57);
 
 		R2_GLOBALS._sceneObjects->draw();
@@ -2731,12 +2731,12 @@ void Scene1337::Action1::signal() {
 		scene->_lowerDisplayCard[6].remove();
 		scene->_lowerDisplayCard[7].remove();
 
-		scene->_discardPile._cardId = scene->_gameBoardSide[2]._delayPile._cardId;
+		scene->_discardPile._cardId = scene->_gameBoardSide[2]._delayCard._cardId;
 
-		scene->_gameBoardSide[2]._delayPile._cardId = 0;
-		scene->_gameBoardSide[2]._delayPile._card.remove();
+		scene->_gameBoardSide[2]._delayCard._cardId = 0;
+		scene->_gameBoardSide[2]._delayCard._card.remove();
 
-		scene->_animatedCard._card.setPosition(scene->_gameBoardSide[2]._delayPile._stationPos, 0);
+		scene->_animatedCard._card.setPosition(scene->_gameBoardSide[2]._delayCard._stationPos, 0);
 		scene->_animatedCard._card.show();
 
 		NpcMover *mover = new NpcMover();
@@ -2750,10 +2750,10 @@ void Scene1337::Action1::signal() {
 
 		R2_GLOBALS._sceneObjects->draw();
 
-		scene->_gameBoardSide[2]._delayPile._card.postInit();
-		scene->_gameBoardSide[2]._delayPile._card.setVisage(1332);
-		scene->_gameBoardSide[2]._delayPile._card.setPosition(scene->_gameBoardSide[2]._delayPile._stationPos, 0);
-		scene->_gameBoardSide[2]._delayPile._card.hide();
+		scene->_gameBoardSide[2]._delayCard._card.postInit();
+		scene->_gameBoardSide[2]._delayCard._card.setVisage(1332);
+		scene->_gameBoardSide[2]._delayCard._card.setPosition(scene->_gameBoardSide[2]._delayCard._stationPos, 0);
+		scene->_gameBoardSide[2]._delayCard._card.hide();
 
 		scene->_gameBoardSide[3]._handCard[1]._cardId = 0;
 		scene->_gameBoardSide[3]._handCard[1].remove();
@@ -2762,13 +2762,13 @@ void Scene1337::Action1::signal() {
 		scene->_animatedCard._card.show();
 
 		NpcMover *mover = new NpcMover();
-		scene->_animatedCard._card.addMover(mover, &scene->_gameBoardSide[2]._delayPile._stationPos, this);
+		scene->_animatedCard._card.addMover(mover, &scene->_gameBoardSide[2]._delayCard._stationPos, this);
 		}
 		break;
 	case 8: {
 		scene->_animatedCard._card.hide();
-		scene->_gameBoardSide[2]._delayPile._cardId = 14;
-		scene->setAnimationInfo(&scene->_gameBoardSide[2]._delayPile);
+		scene->_gameBoardSide[2]._delayCard._cardId = 14;
+		scene->setAnimationInfo(&scene->_gameBoardSide[2]._delayCard);
 		scene->_aSound1.play(57);
 
 		R2_GLOBALS._sceneObjects->draw();
@@ -2861,17 +2861,17 @@ void Scene1337::Action1::signal() {
 		scene->_animatedCard._card.show();
 
 		NpcMover *mover = new NpcMover();
-		scene->_animatedCard._card.addMover(mover, &scene->_gameBoardSide[2]._delayPile._stationPos, this);
+		scene->_animatedCard._card.addMover(mover, &scene->_gameBoardSide[2]._delayCard._stationPos, this);
 		}
 		break;
 	case 9: {
 		scene->_aSound1.play(58);
-		scene->_gameBoardSide[2]._delayPile._cardId = 0;
-		scene->_gameBoardSide[2]._delayPile.remove();
+		scene->_gameBoardSide[2]._delayCard._cardId = 0;
+		scene->_gameBoardSide[2]._delayCard.remove();
 		scene->_animatedCard._card.setStrip(5);
 		scene->_animatedCard._card.setFrame(1);
 		scene->_animatedCard._card.animate(ANIM_MODE_2, NULL);
-		scene->_animatedCard._card.setPosition(scene->_gameBoardSide[2]._delayPile._stationPos, 0);
+		scene->_animatedCard._card.setPosition(scene->_gameBoardSide[2]._delayCard._stationPos, 0);
 		scene->_animatedCard._card.show();
 
 		NpcMover *mover = new NpcMover();
@@ -3026,8 +3026,8 @@ void Scene1337::Action1::signal() {
 			scene->_gameBoardSide[1]._outpostStation[i]._card.remove();
 		}
 
-		scene->_gameBoardSide[2]._delayPile._cardId = 0;
-		scene->_gameBoardSide[2]._delayPile._card.remove();
+		scene->_gameBoardSide[2]._delayCard._cardId = 0;
+		scene->_gameBoardSide[2]._delayCard._card.remove();
 
 		scene->_discardPile._cardId = 0;
 		scene->_discardPile._card.remove();
@@ -3343,11 +3343,12 @@ void Scene1337::Action3::signal() {
 		scene->_gameBoardSide[0]._handCard[2]._card.setStrip(5);
 		scene->_gameBoardSide[0]._handCard[2]._card.setFrame(1);
 		scene->_gameBoardSide[0]._handCard[2]._card.fixPriority(170);
-		scene->_gameBoardSide[0]._handCard[2]._card.hide();
+		scene->_animatedCard._card.hide();
 	default:
 		break;
 	}
 
+	// CHECKME: It's not logical that the number of available cards is decreased for Action Index 12
 	if (_actionIndex > 12) {
 		scene->_currentPlayerNumb = 0;
 		R2_GLOBALS._sceneObjects->draw();
@@ -3364,9 +3365,9 @@ void Scene1337::Action4::signal() {
 
 	switch (_actionIndex++) {
 	case 0:
-		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayPile._cardId))) {
+		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]._delayPile._cardId);
+				scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayCard._cardId);
 			scene->_animatedCard._card.setPosition(Common::Point(162, 95), 0);
 			scene->_animatedCard._card.show();
 			scene->_aSound2.play(61);
@@ -3401,7 +3402,7 @@ void Scene1337::Action4::signal() {
 			scene->setAnimationInfo(&scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[0]);
 
 		scene->_animatedCard._card.hide();
-		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayPile._cardId == 0))) {
+		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayCard._cardId == 0))) {
 			if (scene->_cardsAvailableNumb < 0)
 				scene->shuffleCards();
 			scene->_animatedCard._card.setPosition(Common::Point(162, 95));
@@ -3436,7 +3437,7 @@ void Scene1337::Action4::signal() {
 			scene->setAnimationInfo(&scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[1]);
 
 		scene->_animatedCard._card.hide();
-		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[2]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayPile._cardId == 0))) {
+		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[2]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayCard._cardId == 0))) {
 			if (scene->_cardsAvailableNumb < 0)
 				scene->shuffleCards();
 			scene->_animatedCard._card.setPosition(Common::Point(162, 95));
@@ -3471,7 +3472,7 @@ void Scene1337::Action4::signal() {
 			scene->setAnimationInfo(&scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[2]);
 
 		scene->_animatedCard._card.hide();
-		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[3]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayPile._cardId == 0))) {
+		if ((scene->_gameBoardSide[scene->_currentPlayerNumb]._handCard[3]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_currentPlayerNumb]._delayCard._cardId == 0))) {
 			if (scene->_cardsAvailableNumb < 0)
 				scene->shuffleCards();
 			scene->_animatedCard._card.setPosition(Common::Point(162, 95));
@@ -3634,7 +3635,7 @@ void Scene1337::Action7::signal() {
 		scene->_item5._stationPos.y = scene->_field3EF4->_stationPos.y;
 		scene->_item5._card.postInit();
 		scene->_item5._card.hide();
-		scene->_item5._card._flags = 0x200;
+		scene->_item5._card._flags = OBJFLAG_HIDING;
 
 		scene->subC4A39(&scene->_item5);
 		break;
@@ -4355,7 +4356,7 @@ void Scene1337::postInit(SceneObjectList *OwnerList) {
 	_gameBoardSide[2]._outpostStation[6]._stationPos = Common::Point(171, 174);
 	_gameBoardSide[2]._outpostStation[7]._stationPos = Common::Point(145, 174);
 
-	_gameBoardSide[2]._delayPile._stationPos = Common::Point(199, 174);
+	_gameBoardSide[2]._delayCard._stationPos = Common::Point(199, 174);
 
 	_gameBoardSide[2]._arr4._stationPos = Common::Point(145, 148);
 
@@ -4379,7 +4380,7 @@ void Scene1337::postInit(SceneObjectList *OwnerList) {
 	_gameBoardSide[3]._outpostStation[6]._stationPos = Common::Point(37, 118);
 	_gameBoardSide[3]._outpostStation[7]._stationPos = Common::Point(37, 92);
 
-	_gameBoardSide[3]._delayPile._stationPos = Common::Point(37, 145);
+	_gameBoardSide[3]._delayCard._stationPos = Common::Point(37, 145);
 
 	_gameBoardSide[3]._arr4._stationPos = Common::Point(63, 92);
 
@@ -4403,7 +4404,7 @@ void Scene1337::postInit(SceneObjectList *OwnerList) {
 	_gameBoardSide[0]._outpostStation[6]._stationPos = Common::Point(119, 16);
 	_gameBoardSide[0]._outpostStation[7]._stationPos = Common::Point(145, 16);
 
-	_gameBoardSide[0]._delayPile._stationPos = Common::Point(91, 16);
+	_gameBoardSide[0]._delayCard._stationPos = Common::Point(91, 16);
 
 	_gameBoardSide[0]._arr4._stationPos = Common::Point(145, 42);
 
@@ -4427,7 +4428,7 @@ void Scene1337::postInit(SceneObjectList *OwnerList) {
 	_gameBoardSide[1]._outpostStation[6]._stationPos = Common::Point(253, 70);
 	_gameBoardSide[1]._outpostStation[7]._stationPos = Common::Point(253, 96);
 
-	_gameBoardSide[1]._delayPile._stationPos = Common::Point(253, 43);
+	_gameBoardSide[1]._delayCard._stationPos = Common::Point(253, 43);
 
 	_gameBoardSide[1]._arr4._stationPos = Common::Point(227, 96);
 
@@ -4902,8 +4903,8 @@ bool Scene1337::subC2BF8(Card *subObj1, Common::Point pt) {
 void Scene1337::subC2C2F() {
 	bool found = true;
 
-	if (_gameBoardSide[3]._delayPile._cardId != 0) {
-		switch (_gameBoardSide[3]._delayPile._cardId) {
+	if (_gameBoardSide[3]._delayCard._cardId != 0) {
+		switch (_gameBoardSide[3]._delayCard._cardId) {
 		case 10:
 		// No break on purpose
 		case 12:
@@ -4919,14 +4920,14 @@ void Scene1337::subC2C2F() {
 		case 20:
 		// No break on purpose
 		case 21:
-			subC4A39(&_gameBoardSide[3]._delayPile);
+			subC4A39(&_gameBoardSide[3]._delayCard);
 			found = false;
 			break;
 		default:
 			found = false;
 			int i;
 			for (i = 0; i <= 3; i++) {
-				if (subC3386(_gameBoardSide[3]._delayPile._cardId, _gameBoardSide[3]._handCard[i]._cardId)) {
+				if (subC3386(_gameBoardSide[3]._delayCard._cardId, _gameBoardSide[3]._handCard[i]._cardId)) {
 					found = true;
 					break;
 				}
@@ -4934,7 +4935,7 @@ void Scene1337::subC2C2F() {
 
 			if (found) {
 				found = false;
-				subC34A1(&_gameBoardSide[3]._handCard[i], &_gameBoardSide[3]._delayPile);
+				subC34A1(&_gameBoardSide[3]._handCard[i], &_gameBoardSide[3]._delayCard);
 			}
 			break;
 		}
@@ -4949,7 +4950,7 @@ void Scene1337::subC2C2F() {
 		found = false;
 
 		for (int i = 0; i <= 7; i++) {
-			if ((_gameBoardSide[3]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[3]._delayPile._cardId))) {
+			if ((_gameBoardSide[3]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[3]._delayCard._cardId))) {
 				subC340B(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[3]._outpostStation[i]);
 				found = true;
 				break;
@@ -4971,7 +4972,7 @@ void Scene1337::subC2C2F() {
 
 		if (!found) {
 			for (int i = 0; i <= 7; i++) {
-				if ((_gameBoardSide[3]._outpostStation[i]._cardId == 1) && (!subC2687(_gameBoardSide[3]._delayPile._cardId))) {
+				if ((_gameBoardSide[3]._outpostStation[i]._cardId == 1) && (!subC2687(_gameBoardSide[3]._delayCard._cardId))) {
 					int tmpVal = 0;
 
 					for (int j = 0; j <= 7; j++) {
@@ -5055,7 +5056,7 @@ void Scene1337::subC2C2F() {
 				// It's understandable for 'i', which helps making sure that tmpVal is used properly,
 				// but it's suspect for j
 					for (int j = 0; j <= 7; j++) {
-						if ((_gameBoardSide[tmpRandIndx]._delayPile._cardId == 0) && (subC32B1(tmpRandIndx, _gameBoardSide[3]._handCard[randIndx]._cardId))) {
+						if ((_gameBoardSide[tmpRandIndx]._delayCard._cardId == 0) && (subC32B1(tmpRandIndx, _gameBoardSide[3]._handCard[randIndx]._cardId))) {
 							tmpVal = j;
 						}
 					}
@@ -5071,7 +5072,7 @@ void Scene1337::subC2C2F() {
 
 			if (tmpVal != -1) {
 				// Useless second identical check skipped
-				subC3456(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[tmpVal]._delayPile);
+				subC3456(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[tmpVal]._delayCard);
 				return;
 			}
 			}
@@ -5657,36 +5658,36 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 				break;
 			}
 		} else {
-			if ( (subC2BF8(&_gameBoardSide[2]._delayPile, pt))
-			  || (subC2BF8(&_gameBoardSide[0]._delayPile, pt))
-			  || (subC2BF8(&_gameBoardSide[1]._delayPile, pt))
-			  || (subC2BF8(&_gameBoardSide[3]._delayPile, pt)) ) {
+			if ( (subC2BF8(&_gameBoardSide[2]._delayCard, pt))
+			  || (subC2BF8(&_gameBoardSide[0]._delayCard, pt))
+			  || (subC2BF8(&_gameBoardSide[1]._delayCard, pt))
+			  || (subC2BF8(&_gameBoardSide[3]._delayCard, pt)) ) {
 				found = true;
 			}
 
 			if (found) {
 				switch (curReg) {
 				case 5:
-					if (_gameBoardSide[2]._delayPile._cardId != 0)
-						displayDialog(_gameBoardSide[2]._delayPile._cardId);
+					if (_gameBoardSide[2]._delayCard._cardId != 0)
+						displayDialog(_gameBoardSide[2]._delayCard._cardId);
 					else
 						actionDisplay(1330, 10, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 10:
-					if (_gameBoardSide[3]._delayPile._cardId != 0)
-						displayDialog(_gameBoardSide[3]._delayPile._cardId);
+					if (_gameBoardSide[3]._delayCard._cardId != 0)
+						displayDialog(_gameBoardSide[3]._delayCard._cardId);
 					else
 						actionDisplay(1330, 16, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 15:
-					if (_gameBoardSide[0]._delayPile._cardId != 0)
-						displayDialog(_gameBoardSide[3]._delayPile._cardId);
+					if (_gameBoardSide[0]._delayCard._cardId != 0)
+						displayDialog(_gameBoardSide[3]._delayCard._cardId);
 					else
 						actionDisplay(1330, 13, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 20:
-					if (_gameBoardSide[1]._delayPile._cardId != 0)
-						displayDialog(_gameBoardSide[1]._delayPile._cardId);
+					if (_gameBoardSide[1]._delayCard._cardId != 0)
+						displayDialog(_gameBoardSide[1]._delayCard._cardId);
 					else
 						actionDisplay(1330, 18, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
@@ -5806,8 +5807,8 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		}
 	}
 
-	if (subC2BF8(&_gameBoardSide[2]._delayPile, pt)) {
-		if (_gameBoardSide[0]._delayPile._cardId != 0) {
+	if (subC2BF8(&_gameBoardSide[2]._delayCard, pt)) {
+		if (_gameBoardSide[0]._delayCard._cardId != 0) {
 			actionDisplay(1330, 39, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 		} else {
 			actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
@@ -5815,8 +5816,8 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		found = true;
 	}
 
-	if (subC2BF8(&_gameBoardSide[3]._delayPile, pt)) {
-		if (_gameBoardSide[3]._delayPile._cardId != 0) {
+	if (subC2BF8(&_gameBoardSide[3]._delayCard, pt)) {
+		if (_gameBoardSide[3]._delayCard._cardId != 0) {
 			actionDisplay(1330, 145, 20, 99, 1, 136, 0, 7, 0, 172, 172);
 		} else {
 			actionDisplay(1330, 147, 20, 99, 1, 136, 0, 7, 0, 172, 172);
@@ -5824,8 +5825,8 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		found = true;
 	}
 
-	if (subC2BF8(&_gameBoardSide[1]._delayPile, pt)) {
-		if (_gameBoardSide[1]._delayPile._cardId != 0) {
+	if (subC2BF8(&_gameBoardSide[1]._delayCard, pt)) {
+		if (_gameBoardSide[1]._delayCard._cardId != 0) {
 			actionDisplay(1330, 144, 300, 99, 1, 136, 0, 7, 0, 117, 117);
 		} else {
 			actionDisplay(1330, 146, 300, 99, 1, 136, 0, 7, 0, 117, 117);
@@ -5833,8 +5834,8 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		found = true;
 	}
 
-	if (subC2BF8(&_gameBoardSide[0]._delayPile, pt)) {
-		if (_gameBoardSide[0]._delayPile._cardId != 0) {
+	if (subC2BF8(&_gameBoardSide[0]._delayCard, pt)) {
+		if (_gameBoardSide[0]._delayCard._cardId != 0) {
 			actionDisplay(1330, 1, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 		} else {
 			actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
@@ -5919,8 +5920,8 @@ void Scene1337::subCF31D() {
 	bool found;
 	int count;
 
-	if (this->_gameBoardSide[1]._delayPile._cardId != 0) {
-		switch (_gameBoardSide[1]._delayPile._cardId) {
+	if (this->_gameBoardSide[1]._delayCard._cardId != 0) {
+		switch (_gameBoardSide[1]._delayCard._cardId) {
 		case 10:
 		// No break on purpose
 		case 12:
@@ -5937,13 +5938,13 @@ void Scene1337::subCF31D() {
 		// No break on purpose
 		case 21:
 			tmpVal = 0;
-			subC4A39(&_gameBoardSide[1]._delayPile);
+			subC4A39(&_gameBoardSide[1]._delayCard);
 			break;
 		default:
 			found = false;
 			int i;
 			for (i = 0; i <= 3; i++) {
-				if (subC3386(_gameBoardSide[1]._delayPile._cardId, _gameBoardSide[1]._handCard[i]._cardId)) {
+				if (subC3386(_gameBoardSide[1]._delayCard._cardId, _gameBoardSide[1]._handCard[i]._cardId)) {
 					found = true;
 					break;
 				}
@@ -5951,7 +5952,7 @@ void Scene1337::subCF31D() {
 
 			if (found) {
 				tmpVal = 0;
-				subC34A1(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[1]._delayPile);
+				subC34A1(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[1]._delayCard);
 			}
 		}
 	}
@@ -5978,7 +5979,7 @@ void Scene1337::subCF31D() {
 
 		for (int j = 0; j <= 7; j++) {
 			if (_gameBoardSide[1]._outpostStation[j]._cardId == 1) {
-				if (!subC2687(_gameBoardSide[1]._delayPile._cardId)) {
+				if (!subC2687(_gameBoardSide[1]._delayCard._cardId)) {
 					count = 0;
 					for (int k = 0; k <= 7; k++) {
 						if ((_gameBoardSide[1]._outpostStation[k]._cardId > 1) && (_gameBoardSide[1]._outpostStation[k]._cardId <= 9))
@@ -6002,7 +6003,7 @@ void Scene1337::subCF31D() {
 	tmpVal = subC2719(1);
 	if (tmpVal != -1) {
 		for (int i = 0; i <= 7; i++) {
-			if ((_gameBoardSide[1]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[1]._delayPile._cardId))) {
+			if ((_gameBoardSide[1]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[1]._delayCard._cardId))) {
 				subC340B(&_gameBoardSide[1]._handCard[tmpVal], &_gameBoardSide[1]._outpostStation[i]);
 				found = true;
 				break;
@@ -6066,7 +6067,7 @@ void Scene1337::subCF31D() {
 					for (int k = 0; k <= 7; k++) {
 						// CHECKME: 'k' is not used in that loop.
 						// It looks suspicious.
-						if ((_gameBoardSide[tmpVal]._delayPile._cardId == 0) && (subC32B1(tmpVal, _gameBoardSide[1]._handCard[i]._cardId))) {
+						if ((_gameBoardSide[tmpVal]._delayCard._cardId == 0) && (subC32B1(tmpVal, _gameBoardSide[1]._handCard[i]._cardId))) {
 							count = tmpVal;
 							break;
 						}
@@ -6089,7 +6090,7 @@ void Scene1337::subCF31D() {
 	}
 
 	if (found)
-		subC3456(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[count]._delayPile);
+		subC3456(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[count]._delayCard);
 	else {
 		int j;
 		for (j = 0; j <= 3; j++) {
@@ -6100,7 +6101,7 @@ void Scene1337::subCF31D() {
 					if (rndVal != 1) {
 						for (int m = 0; m <= 7; m++) {
 							// 'm' is not used in that loop. It looks suspicious.
-							if ((_gameBoardSide[rndVal]._delayPile._cardId == 0) && (_gameBoardSide[1]._handCard[j]._cardId == 1)) {
+							if ((_gameBoardSide[rndVal]._delayCard._cardId == 0) && (_gameBoardSide[1]._handCard[j]._cardId == 1)) {
 								count = rndVal;
 								break;
 							}
@@ -6121,7 +6122,7 @@ void Scene1337::subCF31D() {
 		}
 
 		if (found)
-			subC3456(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[count]._delayPile);
+			subC3456(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[count]._delayCard);
 		else
 			subC2835(1);
 	}
@@ -6131,8 +6132,8 @@ void Scene1337::subCF31D() {
 void Scene1337::subCF979() {
 	bool found = true;
 
-	if (_gameBoardSide[0]._delayPile._cardId != 0) {
-		switch (_gameBoardSide[0]._delayPile._cardId) {
+	if (_gameBoardSide[0]._delayCard._cardId != 0) {
+		switch (_gameBoardSide[0]._delayCard._cardId) {
 		case 10:
 		//No break on purpose
 		case 12:
@@ -6148,7 +6149,7 @@ void Scene1337::subCF979() {
 		case 20:
 		//No break on purpose
 		case 21:
-			subC4A39(&_gameBoardSide[0]._delayPile);
+			subC4A39(&_gameBoardSide[0]._delayCard);
 			found = false;
 			break;
 		default:
@@ -6156,7 +6157,7 @@ void Scene1337::subCF979() {
 			found = false;
 
 			for (i = 0; i <= 3; i++) {
-				if (subC3386(_gameBoardSide[0]._delayPile._cardId, _gameBoardSide[0]._handCard[i]._cardId)) {
+				if (subC3386(_gameBoardSide[0]._delayCard._cardId, _gameBoardSide[0]._handCard[i]._cardId)) {
 					found = true;
 					break;
 				}
@@ -6164,7 +6165,7 @@ void Scene1337::subCF979() {
 
 			if (found) {
 				found = false;
-				subC34A1(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[0]._delayPile);
+				subC34A1(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[0]._delayCard);
 			}
 			break;
 		}
@@ -6189,7 +6190,7 @@ void Scene1337::subCF979() {
 
 			if (!flag) {
 				for (int j = 0; j <= 7; j++) {
-					if ((_gameBoardSide[0]._outpostStation[j]._cardId == 1) && (!subC2687(_gameBoardSide[0]._delayPile._cardId))) {
+					if ((_gameBoardSide[0]._outpostStation[j]._cardId == 1) && (!subC2687(_gameBoardSide[0]._delayCard._cardId))) {
 						int count = 0;
 						for (int k = 0; k <= 7; k++) {
 							if ((_gameBoardSide[0]._outpostStation[k]._cardId > 1) && (_gameBoardSide[0]._outpostStation[k]._cardId <= 9)) {
@@ -6219,7 +6220,7 @@ void Scene1337::subCF979() {
 
 	if (tmpVal != -1) {
 		for (int i = 0; i <= 7; i++) {
-			if ((_gameBoardSide[0]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[0]._delayPile._cardId))) {
+			if ((_gameBoardSide[0]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[0]._delayCard._cardId))) {
 				subC340B(&_gameBoardSide[0]._handCard[tmpVal], &_gameBoardSide[0]._outpostStation[i]);
 				found = true;
 				break;
@@ -6262,8 +6263,8 @@ void Scene1337::subCF979() {
 		if (subC27B5(_gameBoardSide[0]._handCard[i]._cardId) != -1) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect
 			for (int j = 0; j <= 7; j++) {
-				if ((_gameBoardSide[2]._delayPile._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._handCard[i]._cardId))) {
-					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[2]._delayPile);
+				if ((_gameBoardSide[2]._delayCard._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._handCard[i]._cardId))) {
+					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[2]._delayCard);
 					found = true;
 					break;
 				}
@@ -6281,8 +6282,8 @@ void Scene1337::subCF979() {
 		if (subC27F9(_gameBoardSide[0]._handCard[i]._cardId) != -1) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect
 			for (int j = 0; j <= 7; j++) {
-				if ((_gameBoardSide[2]._delayPile._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._handCard[i]._cardId))) {
-					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[2]._delayPile);
+				if ((_gameBoardSide[2]._delayCard._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._handCard[i]._cardId))) {
+					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[2]._delayCard);
 					found = true;
 				}
 			}
@@ -6325,8 +6326,8 @@ void Scene1337::subCF979() {
 		if (tmpVal != -1) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect.
 			for (int j = 0; j <= 7; j++) {
-				if ((_gameBoardSide[1]._delayPile._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._handCard[i]._cardId))) {
-					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[1]._delayPile);
+				if ((_gameBoardSide[1]._delayCard._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._handCard[i]._cardId))) {
+					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[1]._delayCard);
 					found = true;
 				}
 			}
@@ -6334,8 +6335,8 @@ void Scene1337::subCF979() {
 			if (!found) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect.
 				for (int j = 0; j <= 7; j++) {
-					if ((_gameBoardSide[3]._delayPile._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._handCard[i]._cardId))) {
-					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[3]._delayPile);
+					if ((_gameBoardSide[3]._delayCard._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._handCard[i]._cardId))) {
+					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[3]._delayCard);
 					found = true;
 					}
 				}
@@ -6354,8 +6355,8 @@ void Scene1337::subCF979() {
 		if (tmpVal != -1) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect.
 			for (int j = 0; j <= 7; j++) {
-				if ((_gameBoardSide[1]._delayPile._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._handCard[i]._cardId))) {
-					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[1]._delayPile);
+				if ((_gameBoardSide[1]._delayCard._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._handCard[i]._cardId))) {
+					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[1]._delayCard);
 					found = true;
 				}
 			}
@@ -6363,8 +6364,8 @@ void Scene1337::subCF979() {
 			if (!found) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect.
 				for (int j = 0; j <= 7; j++) {
-					if ((_gameBoardSide[3]._delayPile._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._handCard[i]._cardId))) {
-					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[3]._delayPile);
+					if ((_gameBoardSide[3]._delayCard._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._handCard[i]._cardId))) {
+					subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[3]._delayCard);
 					found = true;
 					}
 				}
@@ -6386,10 +6387,10 @@ void Scene1337::subD026D() {
 }
 
 void Scene1337::subD0281() {
-	if (subC27F9(this->_gameBoardSide[2]._delayPile._cardId) == -1)
+	if (subC27F9(this->_gameBoardSide[2]._delayCard._cardId) == -1)
 		_unkFctPtr412 = &Scene1337::subD026D;
 	else
-		subC4A39(&_gameBoardSide[2]._delayPile);
+		subC4A39(&_gameBoardSide[2]._delayCard);
 }
 
 void Scene1337::subD02CA() {
@@ -6522,7 +6523,7 @@ void Scene1337::subD02CA() {
 						}
 
 						if ((foundVar4) && (_gameBoardSide[2]._outpostStation[i]._cardId == 0)) {
-							if (subC27B5(_gameBoardSide[2]._delayPile._cardId) != -1) {
+							if (subC27B5(_gameBoardSide[2]._delayCard._cardId) != -1) {
 								actionDisplay(1330, 55, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 							} else {
 								subC340B(&_item6, &_gameBoardSide[2]._outpostStation[i]);
@@ -6550,7 +6551,7 @@ void Scene1337::subD02CA() {
 							}
 							if (foundVar4) {
 								actionDisplay(1330, 34, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-							} else if (subC27B5(_gameBoardSide[2]._delayPile._cardId) != -1) {
+							} else if (subC27B5(_gameBoardSide[2]._delayCard._cardId) != -1) {
 								actionDisplay(1330, 35, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 							} else {
 								if (j == 7)
@@ -6564,11 +6565,11 @@ void Scene1337::subD02CA() {
 						}
 					} else {
 						if ((_item6._cardId == 26) || (_item6._cardId == 30) ||(_item6._cardId == 32) || (_item6._cardId == 28)) {
-							if (subC2BF8(&_gameBoardSide[2]._delayPile, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
+							if (subC2BF8(&_gameBoardSide[2]._delayCard, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
 								actionDisplay(1330, 42, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-							} else if (!subC3386(_gameBoardSide[2]._delayPile._cardId, _item6._cardId)) {
-								if (_gameBoardSide[2]._delayPile._cardId != 0) {
-									switch (_gameBoardSide[2]._delayPile._cardId) {
+							} else if (!subC3386(_gameBoardSide[2]._delayCard._cardId, _item6._cardId)) {
+								if (_gameBoardSide[2]._delayCard._cardId != 0) {
+									switch (_gameBoardSide[2]._delayCard._cardId) {
 									case 11:
 										actionDisplay(1330, 68, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 										break;
@@ -6588,7 +6589,7 @@ void Scene1337::subD02CA() {
 									actionDisplay(1330, 41, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 								}
 							} else {
-								subC34A1(&_item6, &_gameBoardSide[2]._delayPile);
+								subC34A1(&_item6, &_gameBoardSide[2]._delayCard);
 								return;
 							}
 						} else {
@@ -6680,8 +6681,8 @@ void Scene1337::subD02CA() {
 									actionDisplay(1330, 137, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 								}
 							} else {
-								if (subC2BF8(&_gameBoardSide[0]._delayPile, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
-									if (_gameBoardSide[0]._delayPile._cardId != 0) {
+								if (subC2BF8(&_gameBoardSide[0]._delayCard, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
+									if (_gameBoardSide[0]._delayCard._cardId != 0) {
 										actionDisplay(1330, 15, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 									} else if (!subC32B1(0, _item6._cardId)) {
 										switch (_item6._cardId) {
@@ -6713,11 +6714,11 @@ void Scene1337::subD02CA() {
 											break;
 										}
 									} else {
-										subC3456(&_item6, &_gameBoardSide[0]._delayPile);
+										subC3456(&_item6, &_gameBoardSide[0]._delayCard);
 										found = true;
 									}
-								} else if (subC2BF8(&_gameBoardSide[3]._delayPile, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
-									if (_gameBoardSide[3]._delayPile._cardId != 0) {
+								} else if (subC2BF8(&_gameBoardSide[3]._delayCard, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
+									if (_gameBoardSide[3]._delayCard._cardId != 0) {
 										actionDisplay(1330, 17, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 									} else if (!subC32B1(3, _item6._cardId)) {
 										switch (_item6._cardId) {
@@ -6749,11 +6750,11 @@ void Scene1337::subD02CA() {
 											break;
 										}
 									} else {
-										subC3456(&_item6, &_gameBoardSide[3]._delayPile);
+										subC3456(&_item6, &_gameBoardSide[3]._delayCard);
 										found = true;
 									}
-								} else if (subC2BF8(&_gameBoardSide[1]._delayPile, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
-									if (_gameBoardSide[1]._delayPile._cardId != 0) {
+								} else if (subC2BF8(&_gameBoardSide[1]._delayCard, Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) {
+									if (_gameBoardSide[1]._delayCard._cardId != 0) {
 										actionDisplay(1330, 19, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 									} else if (!subC32B1(1, _item6._cardId)) {
 										switch (_item6._cardId) {
@@ -6785,7 +6786,7 @@ void Scene1337::subD02CA() {
 											break;
 										}
 									} else {
-										subC3456(&_item6, &_gameBoardSide[1]._delayPile);
+										subC3456(&_item6, &_gameBoardSide[1]._delayCard);
 										found = true;
 									}
 								} else {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index bf798c7..1653e40 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -198,7 +198,7 @@ class Scene1337 : public SceneExt {
 	public:
 		Card _handCard[4];
 		Card _outpostStation[8];
-		Card _delayPile;
+		Card _delayCard;
 		Card _arr4;
 
 		Common::Point _fieldB94;






More information about the Scummvm-git-logs mailing list