[Scummvm-cvs-logs] scummvm master -> 2d05e980b95b77a1810655ac756238a3432c9d31
Strangerke
Strangerke at scummvm.org
Wed Dec 11 23:26:11 CET 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
884a61f4da TSAGE: R2R - Remove an intermediate (useless) function
8abaf40660 TSAGE: R2R - Optimize subC34EC()
2d05e980b9 TSAGE: R2R - Some more renaming in scene 1337
Commit: 884a61f4dabcc274d1e6a1b3ac0acc37954c0394
https://github.com/scummvm/scummvm/commit/884a61f4dabcc274d1e6a1b3ac0acc37954c0394
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-11T14:22:12-08:00
Commit Message:
TSAGE: R2R - Remove an intermediate (useless) function
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 ec17ab5..db3bc39 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6414,13 +6414,9 @@ void Scene1337::handlePlayer3() {
discardCard(&_gameBoardSide[3]._handCard[randIndx]);
}
-void Scene1337::subD026D() {
- subD02CA();
-}
-
void Scene1337::handlePlayer2() {
if (isSlowCard(this->_gameBoardSide[2]._delayCard._cardId) == -1)
- _delayedFunction = &Scene1337::subD026D;
+ _delayedFunction = &Scene1337::subD02CA;
else
discardCard(&_gameBoardSide[2]._delayCard);
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index bd0b1ec..5833105 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -368,9 +368,8 @@ public:
void handleClick(int arg1, Common::Point pt);
void handlePlayer0();
void handlePlayer1();
- void handlePlayer3();
- void subD026D();
void handlePlayer2();
+ void handlePlayer3();
void subD02CA();
void updateCursorId(int arg1, bool arg2);
void setCursorData(int resNum, int rlbNum, int frameNum);
Commit: 8abaf406609557126666c496632749f2d07aea82
https://github.com/scummvm/scummvm/commit/8abaf406609557126666c496632749f2d07aea82
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-11T14:22:13-08:00
Commit Message:
TSAGE: R2R - Optimize subC34EC()
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 db3bc39..8d8631c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5078,18 +5078,11 @@ void Scene1337::subC34A1(Card *subObj1, Card *subObj2) {
Scene1337::Card *Scene1337::subC34EC(int arg1) {
for (int i = 0; i <= 7; i++) {
- if (_gameBoardSide[arg1]._outpostStation[i]._cardId == 1) {
+ if ((_gameBoardSide[arg1]._outpostStation[i]._cardId > 0) && (_gameBoardSide[arg1]._outpostStation[i]._cardId < 10))
return &_gameBoardSide[arg1]._outpostStation[i];
- }
- }
-
- for (int i = 0; i <= 7; i++) {
- if ((_gameBoardSide[arg1]._outpostStation[i]._cardId != 0) && (_gameBoardSide[arg1]._outpostStation[i]._cardId < 10)) {
- return &_gameBoardSide[arg1]._outpostStation[i];
- }
}
- return NULL;
+ return nullptr;
}
void Scene1337::subC358E(Card *subObj1, int arg2) {
Commit: 2d05e980b95b77a1810655ac756238a3432c9d31
https://github.com/scummvm/scummvm/commit/2d05e980b95b77a1810655ac756238a3432c9d31
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-11T14:22:14-08:00
Commit Message:
TSAGE: R2R - Some more renaming in scene 1337
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 8d8631c..bb8661f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2256,7 +2256,7 @@ Scene1337::Scene1337() {
_actionIdx1 = 0;
_actionIdx2 = 0;
_showPlayerTurn = false;
- _field4246 = false;
+ _displayHelpFl = false;
_winnerId = 0;
_instructionsDisplayedFl = false;
_instructionsWaitCount = 0;
@@ -4092,7 +4092,7 @@ void Scene1337::Action11::signal() {
}
}
} // while
- scene->_field4246 = true;
+ scene->_displayHelpFl = true;
scene->subC4CEC();
} else {
if (scene->_actionIdx2 != 2) {
@@ -4649,9 +4649,9 @@ void Scene1337::subC2586() {
switch (_currentPlayerNumb) {
case 2:
subC4CD2();
- if (_field4246)
+ if (_displayHelpFl)
actionDisplay(1330, 114, 159, 10, 1, 200, 0, 7, 0, 154, 154);
- _field4246 = false;
+ _displayHelpFl = false;
// No break on purpose
case 0:
// No break on purpose
@@ -5085,11 +5085,11 @@ Scene1337::Card *Scene1337::subC34EC(int arg1) {
return nullptr;
}
-void Scene1337::subC358E(Card *subObj1, int arg2) {
- _actionCard1 = subObj1;
- _actionCard2 = subC34EC(arg2);
- _actionCard3 = &_gameBoardSide[arg2]._emptyStationPos;
- _actionIdx1 = arg2;
+void Scene1337::playCounterTrickCard(Card *card, int playerId) {
+ _actionCard1 = card;
+ _actionCard2 = subC34EC(playerId);
+ _actionCard3 = &_gameBoardSide[playerId]._emptyStationPos;
+ _actionIdx1 = playerId;
_item1.setAction(&_action10);
}
@@ -5363,7 +5363,7 @@ void Scene1337::subPostInit() {
_currentPlayerArrow.hide();
_showPlayerTurn = true;
- _field4246 = false;
+ _displayHelpFl = false;
_winnerId = -1;
_helpIcon.postInit();
@@ -5866,7 +5866,7 @@ void Scene1337::handlePlayer0() {
if (tmpVal != -1) {
for (int i = 0; i <= 7; i++) {
if (_gameBoardSide[2]._outpostStation[i]._cardId != 0) {
- subC358E(&_gameBoardSide[0]._handCard[tmpVal], 2);
+ playCounterTrickCard(&_gameBoardSide[0]._handCard[tmpVal], 2);
found = true;
break;
}
@@ -5931,7 +5931,7 @@ void Scene1337::handlePlayer0() {
int tmpVal2 = subC331B(0);
if ((tmpVal != -1) && (tmpVal2 != -1)) {
- subC358E(&_gameBoardSide[0]._handCard[tmpVal], tmpVal2);
+ playCounterTrickCard(&_gameBoardSide[0]._handCard[tmpVal], tmpVal2);
found = true;
}
@@ -6114,7 +6114,7 @@ void Scene1337::handlePlayer1() {
int tmpVal2 = subC331B(1);
if ((tmpVal != -1) && ( tmpVal2 != -1)) {
- subC358E(&_gameBoardSide[1]._handCard[tmpVal], tmpVal2);
+ playCounterTrickCard(&_gameBoardSide[1]._handCard[tmpVal], tmpVal2);
found = true;
}
@@ -6320,7 +6320,7 @@ void Scene1337::handlePlayer3() {
int tmpVal = subC331B(3);
if (tmpVal != -1) {
- subC358E(&_gameBoardSide[3]._handCard[randIndx], tmpVal);
+ playCounterTrickCard(&_gameBoardSide[3]._handCard[randIndx], tmpVal);
return;
}
} else if (_gameBoardSide[3]._handCard[randIndx]._cardId == 25) {
@@ -6630,7 +6630,7 @@ void Scene1337::subD02CA() {
for (int k = 0; k <= 7; k++) {
if (_gameBoardSide[0]._outpostStation[k]._cardId != 0) {
found = true;
- subC358E(&_selectedCard, 0);
+ playCounterTrickCard(&_selectedCard, 0);
}
}
@@ -6640,7 +6640,7 @@ void Scene1337::subD02CA() {
for (int k = 0; k <= 7; k++) {
if (_gameBoardSide[3]._outpostStation[k]._cardId != 0) {
found = true;
- subC358E(&_selectedCard, 3);
+ playCounterTrickCard(&_selectedCard, 3);
}
}
if (!found)
@@ -6649,7 +6649,7 @@ void Scene1337::subD02CA() {
for (int k = 0; k <= 7; k++) {
if (_gameBoardSide[1]._outpostStation[k]._cardId == 0) {
found = true;
- subC358E(&_selectedCard, 1);
+ playCounterTrickCard(&_selectedCard, 1);
}
}
if (!found)
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 5833105..a6de540 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -314,7 +314,7 @@ public:
int _actionIdx1;
int _actionIdx2;
bool _showPlayerTurn;
- bool _field4246;
+ bool _displayHelpFl;
int _winnerId;
bool _instructionsDisplayedFl;
int _instructionsWaitCount;
@@ -352,7 +352,7 @@ public:
void playCard(Card *card, Card *dest);
void subC34A1(Card *subObj1, Card *subObj2);
Card *subC34EC(int arg1);
- void subC358E(Card *subObj1, int arg2);
+ void playCounterTrickCard(Card *card, int playerId);
int getFreeHandCard(int playerId);
void discardCard(Card *card);
void subC4CD2();
More information about the Scummvm-git-logs
mailing list