aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/ringworld2
diff options
context:
space:
mode:
authorStrangerke2013-12-11 22:24:55 +0100
committerStrangerke2013-12-11 23:22:13 +0100
commit8abaf406609557126666c496632749f2d07aea82 (patch)
treea079d1b2be3a7346b85eff4b3a2f5c1b516e2f0f /engines/tsage/ringworld2
parent884a61f4dabcc274d1e6a1b3ac0acc37954c0394 (diff)
downloadscummvm-rg350-8abaf406609557126666c496632749f2d07aea82.tar.gz
scummvm-rg350-8abaf406609557126666c496632749f2d07aea82.tar.bz2
scummvm-rg350-8abaf406609557126666c496632749f2d07aea82.zip
TSAGE: R2R - Optimize subC34EC()
Diffstat (limited to 'engines/tsage/ringworld2')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index db3bc39dab..8d8631ccff 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) {