diff options
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 1034 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 2 |
2 files changed, 518 insertions, 518 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 243fa50287..880df47f0b 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -2454,95 +2454,95 @@ void Scene1337::Action1::signal() { scene->_background2.setup2(1332, 5, 1, 165, 95, 110, 1); - scene->_gameBoardSide[1]._arr1[0]._card.postInit(); - scene->_gameBoardSide[1]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[1]._arr1[0]._card.setPosition(scene->_gameBoardSide[1]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[1]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[1]._arr1[0]._card.setFrame(4); - scene->_gameBoardSide[1]._arr1[0]._card.fixPriority(170); - - scene->_gameBoardSide[1]._arr1[1]._card.postInit(); - scene->_gameBoardSide[1]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[1]._arr1[1]._card.setPosition(scene->_gameBoardSide[1]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[1]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[1]._arr1[1]._card.setFrame(4); - scene->_gameBoardSide[1]._arr1[1]._card.fixPriority(170); - - scene->_gameBoardSide[1]._arr1[2]._card.postInit(); - scene->_gameBoardSide[1]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[1]._arr1[2]._card.setPosition(scene->_gameBoardSide[1]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[1]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[1]._arr1[2]._card.setFrame(4); - scene->_gameBoardSide[1]._arr1[2]._card.fixPriority(170); - - scene->_gameBoardSide[2]._arr1[0]._cardId = 30; - scene->_gameBoardSide[2]._arr1[0]._card.postInit(); - scene->_gameBoardSide[2]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[0]._card.setPosition(scene->_gameBoardSide[2]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[2]._arr1[0]._card.setFrame(2); - scene->_gameBoardSide[2]._arr1[0]._card.fixPriority(170); - scene->setAnimationInfo(&scene->_gameBoardSide[2]._arr1[0]); - - scene->_gameBoardSide[2]._arr1[1]._cardId = 16; - scene->_gameBoardSide[2]._arr1[1]._card.postInit(); - scene->_gameBoardSide[2]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[1]._card.setPosition(scene->_gameBoardSide[2]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[2]._arr1[1]._card.setFrame(2); - scene->_gameBoardSide[2]._arr1[1]._card.fixPriority(170); - scene->setAnimationInfo(&scene->_gameBoardSide[2]._arr1[1]); - - scene->_gameBoardSide[2]._arr1[2]._cardId = 1; - scene->_gameBoardSide[2]._arr1[2]._card.postInit(); - scene->_gameBoardSide[2]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[2]._card.setPosition(scene->_gameBoardSide[2]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[2]._arr1[2]._card.setFrame(2); - scene->_gameBoardSide[2]._arr1[2]._card.fixPriority(170); - scene->setAnimationInfo(&scene->_gameBoardSide[2]._arr1[2]); - - scene->_gameBoardSide[3]._arr1[0]._card.postInit(); - scene->_gameBoardSide[3]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[3]._arr1[0]._card.setPosition(scene->_gameBoardSide[3]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[3]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[3]._arr1[0]._card.setFrame(3); - scene->_gameBoardSide[3]._arr1[0]._card.fixPriority(170); - - scene->_gameBoardSide[3]._arr1[1]._card.postInit(); - scene->_gameBoardSide[3]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[3]._arr1[1]._card.setPosition(scene->_gameBoardSide[3]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[3]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[3]._arr1[1]._card.setFrame(3); - scene->_gameBoardSide[3]._arr1[1]._card.fixPriority(170); - - scene->_gameBoardSide[3]._arr1[2]._card.postInit(); - scene->_gameBoardSide[3]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[3]._arr1[2]._card.setPosition(scene->_gameBoardSide[3]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[3]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[3]._arr1[2]._card.setFrame(3); - scene->_gameBoardSide[3]._arr1[2]._card.fixPriority(170); - - scene->_gameBoardSide[0]._arr1[0]._card.postInit(); - scene->_gameBoardSide[0]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[0]._arr1[0]._card.setPosition(scene->_gameBoardSide[0]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[0]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[0]._arr1[0]._card.setFrame(2); - scene->_gameBoardSide[0]._arr1[0]._card.fixPriority(170); - - scene->_gameBoardSide[0]._arr1[1]._card.postInit(); - scene->_gameBoardSide[0]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[0]._arr1[1]._card.setPosition(scene->_gameBoardSide[0]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[0]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[0]._arr1[1]._card.setFrame(2); - scene->_gameBoardSide[0]._arr1[1]._card.fixPriority(170); - - scene->_gameBoardSide[0]._arr1[2]._card.postInit(); - scene->_gameBoardSide[0]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[0]._arr1[2]._card.setPosition(scene->_gameBoardSide[0]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[0]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[0]._arr1[2]._card.setFrame(2); - scene->_gameBoardSide[0]._arr1[2]._card.fixPriority(170); + scene->_gameBoardSide[1]._handCard[0]._card.postInit(); + scene->_gameBoardSide[1]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[1]._handCard[0]._card.setPosition(scene->_gameBoardSide[1]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[1]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[1]._handCard[0]._card.setFrame(4); + scene->_gameBoardSide[1]._handCard[0]._card.fixPriority(170); + + scene->_gameBoardSide[1]._handCard[1]._card.postInit(); + scene->_gameBoardSide[1]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[1]._handCard[1]._card.setPosition(scene->_gameBoardSide[1]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[1]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[1]._handCard[1]._card.setFrame(4); + scene->_gameBoardSide[1]._handCard[1]._card.fixPriority(170); + + scene->_gameBoardSide[1]._handCard[2]._card.postInit(); + scene->_gameBoardSide[1]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[1]._handCard[2]._card.setPosition(scene->_gameBoardSide[1]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[1]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[1]._handCard[2]._card.setFrame(4); + scene->_gameBoardSide[1]._handCard[2]._card.fixPriority(170); + + scene->_gameBoardSide[2]._handCard[0]._cardId = 30; + scene->_gameBoardSide[2]._handCard[0]._card.postInit(); + scene->_gameBoardSide[2]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[0]._card.setPosition(scene->_gameBoardSide[2]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[2]._handCard[0]._card.setFrame(2); + scene->_gameBoardSide[2]._handCard[0]._card.fixPriority(170); + scene->setAnimationInfo(&scene->_gameBoardSide[2]._handCard[0]); + + scene->_gameBoardSide[2]._handCard[1]._cardId = 16; + scene->_gameBoardSide[2]._handCard[1]._card.postInit(); + scene->_gameBoardSide[2]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[1]._card.setPosition(scene->_gameBoardSide[2]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[2]._handCard[1]._card.setFrame(2); + scene->_gameBoardSide[2]._handCard[1]._card.fixPriority(170); + scene->setAnimationInfo(&scene->_gameBoardSide[2]._handCard[1]); + + scene->_gameBoardSide[2]._handCard[2]._cardId = 1; + scene->_gameBoardSide[2]._handCard[2]._card.postInit(); + scene->_gameBoardSide[2]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[2]._card.setPosition(scene->_gameBoardSide[2]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[2]._handCard[2]._card.setFrame(2); + scene->_gameBoardSide[2]._handCard[2]._card.fixPriority(170); + scene->setAnimationInfo(&scene->_gameBoardSide[2]._handCard[2]); + + scene->_gameBoardSide[3]._handCard[0]._card.postInit(); + scene->_gameBoardSide[3]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[3]._handCard[0]._card.setPosition(scene->_gameBoardSide[3]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[3]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[3]._handCard[0]._card.setFrame(3); + scene->_gameBoardSide[3]._handCard[0]._card.fixPriority(170); + + scene->_gameBoardSide[3]._handCard[1]._card.postInit(); + scene->_gameBoardSide[3]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[3]._handCard[1]._card.setPosition(scene->_gameBoardSide[3]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[3]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[3]._handCard[1]._card.setFrame(3); + scene->_gameBoardSide[3]._handCard[1]._card.fixPriority(170); + + scene->_gameBoardSide[3]._handCard[2]._card.postInit(); + scene->_gameBoardSide[3]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[3]._handCard[2]._card.setPosition(scene->_gameBoardSide[3]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[3]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[3]._handCard[2]._card.setFrame(3); + scene->_gameBoardSide[3]._handCard[2]._card.fixPriority(170); + + scene->_gameBoardSide[0]._handCard[0]._card.postInit(); + scene->_gameBoardSide[0]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[0]._handCard[0]._card.setPosition(scene->_gameBoardSide[0]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[0]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[0]._handCard[0]._card.setFrame(2); + scene->_gameBoardSide[0]._handCard[0]._card.fixPriority(170); + + scene->_gameBoardSide[0]._handCard[1]._card.postInit(); + scene->_gameBoardSide[0]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[0]._handCard[1]._card.setPosition(scene->_gameBoardSide[0]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[0]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[0]._handCard[1]._card.setFrame(2); + scene->_gameBoardSide[0]._handCard[1]._card.fixPriority(170); + + scene->_gameBoardSide[0]._handCard[2]._card.postInit(); + scene->_gameBoardSide[0]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[0]._handCard[2]._card.setPosition(scene->_gameBoardSide[0]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[0]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[0]._handCard[2]._card.setFrame(2); + scene->_gameBoardSide[0]._handCard[2]._card.fixPriority(170); R2_GLOBALS._sceneObjects->draw(); @@ -2557,16 +2557,16 @@ void Scene1337::Action1::signal() { } break; case 2: { - scene->_gameBoardSide[2]._arr1[3]._cardId = 2; - scene->_gameBoardSide[2]._arr1[3]._card.postInit(); - scene->_gameBoardSide[2]._arr1[3]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[3]._card.setPosition(scene->_gameBoardSide[2]._arr1[3]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[3]._card.setStrip(1); - scene->_gameBoardSide[2]._arr1[3]._card.setFrame(2); - scene->_gameBoardSide[2]._arr1[3]._card.fixPriority(170); + scene->_gameBoardSide[2]._handCard[3]._cardId = 2; + scene->_gameBoardSide[2]._handCard[3]._card.postInit(); + scene->_gameBoardSide[2]._handCard[3]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[3]._card.setPosition(scene->_gameBoardSide[2]._handCard[3]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[3]._card.setStrip(1); + scene->_gameBoardSide[2]._handCard[3]._card.setFrame(2); + scene->_gameBoardSide[2]._handCard[3]._card.fixPriority(170); scene->_item2._card.hide(); - scene->setAnimationInfo(&scene->_gameBoardSide[2]._arr1[3]); + scene->setAnimationInfo(&scene->_gameBoardSide[2]._handCard[3]); R2_GLOBALS._sceneObjects->draw(); @@ -2580,14 +2580,14 @@ void Scene1337::Action1::signal() { scene->_gameBoardSide[2]._outpostStation[1]._card.setPosition(scene->_gameBoardSide[2]._outpostStation[1]._stationPos, 0); scene->_gameBoardSide[2]._outpostStation[1]._card.hide(); - scene->_item2._card.setStrip(scene->_gameBoardSide[2]._arr1[2]._card._strip); - scene->_item2._card.setFrame(scene->_gameBoardSide[2]._arr1[2]._card._frame); + scene->_item2._card.setStrip(scene->_gameBoardSide[2]._handCard[2]._card._strip); + scene->_item2._card.setFrame(scene->_gameBoardSide[2]._handCard[2]._card._frame); scene->_item2._card.animate(ANIM_MODE_NONE, NULL); - scene->_gameBoardSide[2]._arr1[2]._cardId = 0; - scene->_gameBoardSide[2]._arr1[2]._card.remove(); + scene->_gameBoardSide[2]._handCard[2]._cardId = 0; + scene->_gameBoardSide[2]._handCard[2]._card.remove(); - scene->_item2._card.setPosition(scene->_gameBoardSide[2]._arr1[2]._stationPos, 0); + scene->_item2._card.setPosition(scene->_gameBoardSide[2]._handCard[2]._stationPos, 0); scene->_item2._card.show(); NpcMover *mover = new NpcMover(); @@ -2604,15 +2604,15 @@ void Scene1337::Action1::signal() { waitFrames(60); scene->actionDisplay(1331, 13, 159, 10, 1, 200, 0, 7, 0, 154, 154); - scene->_gameBoardSide[2]._outpostStation[1]._cardId = scene->_gameBoardSide[2]._arr1[3]._cardId; + scene->_gameBoardSide[2]._outpostStation[1]._cardId = scene->_gameBoardSide[2]._handCard[3]._cardId; - scene->_item2._card.setStrip(scene->_gameBoardSide[2]._arr1[3]._card._strip); - scene->_item2._card.setFrame(scene->_gameBoardSide[2]._arr1[3]._card._frame); + scene->_item2._card.setStrip(scene->_gameBoardSide[2]._handCard[3]._card._strip); + scene->_item2._card.setFrame(scene->_gameBoardSide[2]._handCard[3]._card._frame); - scene->_gameBoardSide[2]._arr1[3]._cardId = 0; - scene->_gameBoardSide[2]._arr1[3]._card.remove(); + scene->_gameBoardSide[2]._handCard[3]._cardId = 0; + scene->_gameBoardSide[2]._handCard[3]._card.remove(); - scene->_item2._card.setPosition(scene->_gameBoardSide[2]._arr1[3]._stationPos, 0); + scene->_item2._card.setPosition(scene->_gameBoardSide[2]._handCard[3]._stationPos, 0); scene->_item2._card.show(); NpcMover *mover = new NpcMover(); @@ -2656,10 +2656,10 @@ void Scene1337::Action1::signal() { scene->_gameBoardSide[2]._arr3[0]._card.setPosition(scene->_gameBoardSide[2]._arr3[0]._stationPos, 0); scene->_gameBoardSide[2]._arr3[0]._card.hide(); - scene->_gameBoardSide[3]._arr1[2]._cardId = 0; - scene->_gameBoardSide[3]._arr1[2].remove(); + scene->_gameBoardSide[3]._handCard[2]._cardId = 0; + scene->_gameBoardSide[3]._handCard[2].remove(); - scene->_item2._card.setPosition(scene->_gameBoardSide[3]._arr1[2]._stationPos, 0); + scene->_item2._card.setPosition(scene->_gameBoardSide[3]._handCard[2]._stationPos, 0); scene->_item2._card.show(); NpcMover *mover = new NpcMover(); @@ -2752,10 +2752,10 @@ void Scene1337::Action1::signal() { scene->_gameBoardSide[2]._arr3[0]._card.setPosition(scene->_gameBoardSide[2]._arr3[0]._stationPos, 0); scene->_gameBoardSide[2]._arr3[0]._card.hide(); - scene->_gameBoardSide[3]._arr1[1]._cardId = 0; - scene->_gameBoardSide[3]._arr1[1].remove(); + scene->_gameBoardSide[3]._handCard[1]._cardId = 0; + scene->_gameBoardSide[3]._handCard[1].remove(); - scene->_item2._card.setPosition(scene->_gameBoardSide[3]._arr1[1]._stationPos, 0); + scene->_item2._card.setPosition(scene->_gameBoardSide[3]._handCard[1]._stationPos, 0); scene->_item2._card.show(); NpcMover *mover = new NpcMover(); @@ -2845,16 +2845,16 @@ void Scene1337::Action1::signal() { scene->_arrObject2[6].remove(); scene->_arrObject2[7].remove(); - scene->_item7._cardId = scene->_gameBoardSide[2]._arr1[0]._cardId; + scene->_item7._cardId = scene->_gameBoardSide[2]._handCard[0]._cardId; - scene->_item2._card.setStrip(scene->_gameBoardSide[2]._arr1[0]._card._strip); - scene->_item2._card.setFrame(scene->_gameBoardSide[2]._arr1[0]._card._frame); + scene->_item2._card.setStrip(scene->_gameBoardSide[2]._handCard[0]._card._strip); + scene->_item2._card.setFrame(scene->_gameBoardSide[2]._handCard[0]._card._frame); scene->_item2._card.animate(ANIM_MODE_NONE, NULL); - scene->_gameBoardSide[2]._arr1[0]._cardId = 0; - scene->_gameBoardSide[2]._arr1[0]._card.remove(); + scene->_gameBoardSide[2]._handCard[0]._cardId = 0; + scene->_gameBoardSide[2]._handCard[0]._card.remove(); - scene->_item2._card.setPosition(scene->_gameBoardSide[2]._arr1[0]._stationPos, 0); + scene->_item2._card.setPosition(scene->_gameBoardSide[2]._handCard[0]._stationPos, 0); scene->_item2._card.show(); NpcMover *mover = new NpcMover(); @@ -2966,16 +2966,16 @@ void Scene1337::Action1::signal() { scene->actionDisplay(1331, 20, 159, 10, 1, 220, 0, 7, 0, 154, 154); scene->actionDisplay(1331, 21, 159, 10, 1, 220, 0, 7, 0, 154, 154); - scene->_item7._cardId = scene->_gameBoardSide[2]._arr1[1]._cardId; + scene->_item7._cardId = scene->_gameBoardSide[2]._handCard[1]._cardId; - scene->_item2._card.setStrip(scene->_gameBoardSide[2]._arr1[1]._card._strip); - scene->_item2._card.setFrame(scene->_gameBoardSide[2]._arr1[1]._card._frame); + scene->_item2._card.setStrip(scene->_gameBoardSide[2]._handCard[1]._card._strip); + scene->_item2._card.setFrame(scene->_gameBoardSide[2]._handCard[1]._card._frame); scene->_item2._card.animate(ANIM_MODE_NONE, NULL); - scene->_gameBoardSide[2]._arr1[1]._cardId = 0; - scene->_gameBoardSide[2]._arr1[1]._card.remove(); + scene->_gameBoardSide[2]._handCard[1]._cardId = 0; + scene->_gameBoardSide[2]._handCard[1]._card.remove(); - scene->_item2._card.setPosition(scene->_gameBoardSide[2]._arr1[1]._stationPos, 0); + scene->_item2._card.setPosition(scene->_gameBoardSide[2]._handCard[1]._stationPos, 0); scene->_item2._card.show(); NpcMover *mover = new NpcMover(); @@ -2996,17 +2996,17 @@ void Scene1337::Action1::signal() { int i = -1; for (i = 0; i <= 3; i ++) { - scene->_gameBoardSide[3]._arr1[i]._cardId = 0; - scene->_gameBoardSide[3]._arr1[i]._card.remove(); + scene->_gameBoardSide[3]._handCard[i]._cardId = 0; + scene->_gameBoardSide[3]._handCard[i]._card.remove(); - scene->_gameBoardSide[2]._arr1[i]._cardId = 0; - scene->_gameBoardSide[2]._arr1[i]._card.remove(); + scene->_gameBoardSide[2]._handCard[i]._cardId = 0; + scene->_gameBoardSide[2]._handCard[i]._card.remove(); - scene->_gameBoardSide[0]._arr1[i]._cardId = 0; - scene->_gameBoardSide[0]._arr1[i]._card.remove(); + scene->_gameBoardSide[0]._handCard[i]._cardId = 0; + scene->_gameBoardSide[0]._handCard[i]._card.remove(); - scene->_gameBoardSide[1]._arr1[i]._cardId = 0; - scene->_gameBoardSide[1]._arr1[i]._card.remove(); + scene->_gameBoardSide[1]._handCard[i]._cardId = 0; + scene->_gameBoardSide[1]._handCard[i]._card.remove(); } for (i = 0; i <= 7; i++) { @@ -3105,43 +3105,43 @@ void Scene1337::Action3::signal() { scene->_item2._card.addMover(mover, &pt, this); scene->_item2._card.show(); - scene->_gameBoardSide[1]._arr1[0]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[1]._handCard[0]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 1: { - scene->_gameBoardSide[1]._arr1[0]._card.postInit(); - scene->_gameBoardSide[1]._arr1[0]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[1]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[1]._arr1[0]._card.setPosition(scene->_gameBoardSide[1]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[1]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[1]._arr1[0]._card.setFrame(4); - scene->_gameBoardSide[1]._arr1[0]._card.fixPriority(170); + scene->_gameBoardSide[1]._handCard[0]._card.postInit(); + scene->_gameBoardSide[1]._handCard[0]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[1]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[1]._handCard[0]._card.setPosition(scene->_gameBoardSide[1]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[1]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[1]._handCard[0]._card.setFrame(4); + scene->_gameBoardSide[1]._handCard[0]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(10, 174); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[2]._arr1[0]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[2]._handCard[0]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 2: { - scene->_gameBoardSide[2]._arr1[0]._card.postInit(); - scene->_gameBoardSide[2]._arr1[0]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[2]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[0]._card.setPosition(scene->_gameBoardSide[2]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[0]._card.fixPriority(170); - if (scene->_gameBoardSide[2]._arr1[0]._cardId > 9) { - if (scene->_gameBoardSide[2]._arr1[0]._cardId > 25) { - scene->_gameBoardSide[2]._arr1[0]._card.setStrip(4); - scene->_gameBoardSide[2]._arr1[0]._card.setFrame(scene->_gameBoardSide[2]._arr1[0]._cardId - 25); + scene->_gameBoardSide[2]._handCard[0]._card.postInit(); + scene->_gameBoardSide[2]._handCard[0]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[2]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[0]._card.setPosition(scene->_gameBoardSide[2]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[0]._card.fixPriority(170); + if (scene->_gameBoardSide[2]._handCard[0]._cardId > 9) { + if (scene->_gameBoardSide[2]._handCard[0]._cardId > 25) { + scene->_gameBoardSide[2]._handCard[0]._card.setStrip(4); + scene->_gameBoardSide[2]._handCard[0]._card.setFrame(scene->_gameBoardSide[2]._handCard[0]._cardId - 25); } else { - scene->_gameBoardSide[2]._arr1[0]._card.setStrip(3); - scene->_gameBoardSide[2]._arr1[0]._card.setFrame(scene->_gameBoardSide[2]._arr1[0]._cardId - 9); + scene->_gameBoardSide[2]._handCard[0]._card.setStrip(3); + scene->_gameBoardSide[2]._handCard[0]._card.setFrame(scene->_gameBoardSide[2]._handCard[0]._cardId - 9); } } else { - scene->_gameBoardSide[2]._arr1[0]._card.setStrip(2); - scene->_gameBoardSide[2]._arr1[0]._card.setFrame(scene->_gameBoardSide[2]._arr1[0]._cardId); + scene->_gameBoardSide[2]._handCard[0]._card.setStrip(2); + scene->_gameBoardSide[2]._handCard[0]._card.setFrame(scene->_gameBoardSide[2]._handCard[0]._cardId); } scene->_aSound2.play(61); @@ -3149,78 +3149,78 @@ void Scene1337::Action3::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[3]._arr1[0]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[3]._handCard[0]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 3: { - scene->_gameBoardSide[3]._arr1[0]._card.postInit(); - scene->_gameBoardSide[3]._arr1[0]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[3]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[3]._arr1[0]._card.setPosition(scene->_gameBoardSide[3]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[3]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[3]._arr1[0]._card.setFrame(3); - scene->_gameBoardSide[3]._arr1[0]._card.fixPriority(170); + scene->_gameBoardSide[3]._handCard[0]._card.postInit(); + scene->_gameBoardSide[3]._handCard[0]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[3]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[3]._handCard[0]._card.setPosition(scene->_gameBoardSide[3]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[3]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[3]._handCard[0]._card.setFrame(3); + scene->_gameBoardSide[3]._handCard[0]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(280, 5); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[0]._arr1[0]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[0]._handCard[0]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 4: { - scene->_gameBoardSide[0]._arr1[0]._card.postInit(); - scene->_gameBoardSide[0]._arr1[0]._card._moveDiff = Common::Point(30,30); - scene->_gameBoardSide[0]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[0]._arr1[0]._card.setPosition(scene->_gameBoardSide[0]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[0]._arr1[0]._card.setStrip(5); - scene->_gameBoardSide[0]._arr1[0]._card.setFrame(1); - scene->_gameBoardSide[0]._arr1[0]._card.fixPriority(170); + scene->_gameBoardSide[0]._handCard[0]._card.postInit(); + scene->_gameBoardSide[0]._handCard[0]._card._moveDiff = Common::Point(30,30); + scene->_gameBoardSide[0]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[0]._handCard[0]._card.setPosition(scene->_gameBoardSide[0]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[0]._handCard[0]._card.setStrip(5); + scene->_gameBoardSide[0]._handCard[0]._card.setFrame(1); + scene->_gameBoardSide[0]._handCard[0]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(283, 124); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[1]._arr1[1]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[1]._handCard[1]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 5: { - scene->_gameBoardSide[1]._arr1[1]._card.postInit(); - scene->_gameBoardSide[1]._arr1[1]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[1]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[1]._arr1[1]._card.setPosition(scene->_gameBoardSide[1]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[1]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[1]._arr1[1]._card.setFrame(4); - scene->_gameBoardSide[1]._arr1[1]._card.fixPriority(170); + scene->_gameBoardSide[1]._handCard[1]._card.postInit(); + scene->_gameBoardSide[1]._handCard[1]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[1]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[1]._handCard[1]._card.setPosition(scene->_gameBoardSide[1]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[1]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[1]._handCard[1]._card.setFrame(4); + scene->_gameBoardSide[1]._handCard[1]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(37, 174); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[2]._arr1[1]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[2]._handCard[1]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 6: { - scene->_gameBoardSide[2]._arr1[1]._card.postInit(); - scene->_gameBoardSide[2]._arr1[1]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[2]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[1]._card.setPosition(scene->_gameBoardSide[2]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[1]._card.fixPriority(170); - - if (scene->_gameBoardSide[2]._arr1[1]._cardId > 9) { - if (scene->_gameBoardSide[2]._arr1[1]._cardId > 25) { - scene->_gameBoardSide[2]._arr1[1]._card.setStrip(4); - scene->_gameBoardSide[2]._arr1[1]._card.setFrame(scene->_gameBoardSide[2]._arr1[1]._cardId - 25); + scene->_gameBoardSide[2]._handCard[1]._card.postInit(); + scene->_gameBoardSide[2]._handCard[1]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[2]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[1]._card.setPosition(scene->_gameBoardSide[2]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[1]._card.fixPriority(170); + + if (scene->_gameBoardSide[2]._handCard[1]._cardId > 9) { + if (scene->_gameBoardSide[2]._handCard[1]._cardId > 25) { + scene->_gameBoardSide[2]._handCard[1]._card.setStrip(4); + scene->_gameBoardSide[2]._handCard[1]._card.setFrame(scene->_gameBoardSide[2]._handCard[1]._cardId - 25); } else { - scene->_gameBoardSide[2]._arr1[1]._card.setStrip(3); - scene->_gameBoardSide[2]._arr1[1]._card.setFrame(scene->_gameBoardSide[2]._arr1[1]._cardId - 9); + scene->_gameBoardSide[2]._handCard[1]._card.setStrip(3); + scene->_gameBoardSide[2]._handCard[1]._card.setFrame(scene->_gameBoardSide[2]._handCard[1]._cardId - 9); } } else { - scene->_gameBoardSide[2]._arr1[1]._card.setStrip(2); - scene->_gameBoardSide[2]._arr1[1]._card.setFrame(scene->_gameBoardSide[2]._arr1[1]._cardId); + scene->_gameBoardSide[2]._handCard[1]._card.setStrip(2); + scene->_gameBoardSide[2]._handCard[1]._card.setFrame(scene->_gameBoardSide[2]._handCard[1]._cardId); } scene->_aSound2.play(61); @@ -3229,78 +3229,78 @@ void Scene1337::Action3::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[3]._arr1[1]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[3]._handCard[1]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 7: { - scene->_gameBoardSide[3]._arr1[1]._card.postInit(); - scene->_gameBoardSide[3]._arr1[1]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[3]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[3]._arr1[1]._card.setPosition(scene->_gameBoardSide[3]._arr1[1]._stationPos); - scene->_gameBoardSide[3]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[3]._arr1[1]._card.setFrame(3); - scene->_gameBoardSide[3]._arr1[1]._card.fixPriority(170); + scene->_gameBoardSide[3]._handCard[1]._card.postInit(); + scene->_gameBoardSide[3]._handCard[1]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[3]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[3]._handCard[1]._card.setPosition(scene->_gameBoardSide[3]._handCard[1]._stationPos); + scene->_gameBoardSide[3]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[3]._handCard[1]._card.setFrame(3); + scene->_gameBoardSide[3]._handCard[1]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(253, 5); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[0]._arr1[1]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[0]._handCard[1]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 8: { - scene->_gameBoardSide[0]._arr1[1]._card.postInit(); - scene->_gameBoardSide[0]._arr1[1]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[0]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[0]._arr1[1]._card.setPosition(scene->_gameBoardSide[0]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[0]._arr1[1]._card.setStrip(5); - scene->_gameBoardSide[0]._arr1[1]._card.setFrame(1); - scene->_gameBoardSide[0]._arr1[1]._card.fixPriority(170); + scene->_gameBoardSide[0]._handCard[1]._card.postInit(); + scene->_gameBoardSide[0]._handCard[1]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[0]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[0]._handCard[1]._card.setPosition(scene->_gameBoardSide[0]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[0]._handCard[1]._card.setStrip(5); + scene->_gameBoardSide[0]._handCard[1]._card.setFrame(1); + scene->_gameBoardSide[0]._handCard[1]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(283, 102); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[1]._arr1[2]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[1]._handCard[2]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 9: { - scene->_gameBoardSide[1]._arr1[2]._card.postInit(); - scene->_gameBoardSide[1]._arr1[2]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[1]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[1]._arr1[2]._card.setPosition(scene->_gameBoardSide[1]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[1]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[1]._arr1[2]._card.setFrame(4); - scene->_gameBoardSide[1]._arr1[2]._card.fixPriority(170); + scene->_gameBoardSide[1]._handCard[2]._card.postInit(); + scene->_gameBoardSide[1]._handCard[2]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[1]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[1]._handCard[2]._card.setPosition(scene->_gameBoardSide[1]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[1]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[1]._handCard[2]._card.setFrame(4); + scene->_gameBoardSide[1]._handCard[2]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(64, 174); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[2]._arr1[2]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[2]._handCard[2]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 10: { - scene->_gameBoardSide[2]._arr1[2]._card.postInit(); - scene->_gameBoardSide[2]._arr1[2]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[2]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[2]._arr1[2]._card.setPosition(scene->_gameBoardSide[2]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[2]._arr1[2]._card.fixPriority(170); - - if (scene->_gameBoardSide[2]._arr1[2]._cardId > 9) { - if (scene->_gameBoardSide[2]._arr1[2]._cardId > 25) { - scene->_gameBoardSide[2]._arr1[2]._card.setStrip(4); - scene->_gameBoardSide[2]._arr1[2]._card.setFrame(scene->_gameBoardSide[2]._arr1[2]._cardId - 25); + scene->_gameBoardSide[2]._handCard[2]._card.postInit(); + scene->_gameBoardSide[2]._handCard[2]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[2]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[2]._handCard[2]._card.setPosition(scene->_gameBoardSide[2]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[2]._handCard[2]._card.fixPriority(170); + + if (scene->_gameBoardSide[2]._handCard[2]._cardId > 9) { + if (scene->_gameBoardSide[2]._handCard[2]._cardId > 25) { + scene->_gameBoardSide[2]._handCard[2]._card.setStrip(4); + scene->_gameBoardSide[2]._handCard[2]._card.setFrame(scene->_gameBoardSide[2]._handCard[2]._cardId - 25); } else { - scene->_gameBoardSide[2]._arr1[2]._card.setStrip(3); - scene->_gameBoardSide[2]._arr1[2]._card.setFrame(scene->_gameBoardSide[2]._arr1[2]._cardId - 9); + scene->_gameBoardSide[2]._handCard[2]._card.setStrip(3); + scene->_gameBoardSide[2]._handCard[2]._card.setFrame(scene->_gameBoardSide[2]._handCard[2]._cardId - 9); } } else { - scene->_gameBoardSide[2]._arr1[2]._card.setStrip(2); - scene->_gameBoardSide[2]._arr1[2]._card.setFrame(scene->_gameBoardSide[2]._arr1[2]._cardId); + scene->_gameBoardSide[2]._handCard[2]._card.setStrip(2); + scene->_gameBoardSide[2]._handCard[2]._card.setFrame(scene->_gameBoardSide[2]._handCard[2]._cardId); } scene->_aSound2.play(61); @@ -3309,35 +3309,35 @@ void Scene1337::Action3::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[3]._arr1[2]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[3]._handCard[2]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 11: { - scene->_gameBoardSide[3]._arr1[2]._card.postInit(); - scene->_gameBoardSide[3]._arr1[2]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[3]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[3]._arr1[2]._card.setPosition(scene->_gameBoardSide[3]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[3]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[3]._arr1[2]._card.setFrame(3); - scene->_gameBoardSide[3]._arr1[2]._card.fixPriority(170); + scene->_gameBoardSide[3]._handCard[2]._card.postInit(); + scene->_gameBoardSide[3]._handCard[2]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[3]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[3]._handCard[2]._card.setPosition(scene->_gameBoardSide[3]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[3]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[3]._handCard[2]._card.setFrame(3); + scene->_gameBoardSide[3]._handCard[2]._card.fixPriority(170); scene->_aSound2.play(61); Common::Point pt(226, 5); NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &pt, this); - scene->_gameBoardSide[0]._arr1[2]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[0]._handCard[2]._cardId = scene->_field3E28[scene->_field3E24]; } break; case 12: - scene->_gameBoardSide[0]._arr1[2]._card.postInit(); - scene->_gameBoardSide[0]._arr1[2]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[0]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[0]._arr1[2]._card.setPosition(scene->_gameBoardSide[0]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[0]._arr1[2]._card.setStrip(5); - scene->_gameBoardSide[0]._arr1[2]._card.setFrame(1); - scene->_gameBoardSide[0]._arr1[2]._card.fixPriority(170); - scene->_gameBoardSide[0]._arr1[2]._card.hide(); + scene->_gameBoardSide[0]._handCard[2]._card.postInit(); + scene->_gameBoardSide[0]._handCard[2]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[0]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[0]._handCard[2]._card.setPosition(scene->_gameBoardSide[0]._handCard[2]._stationPos, 0); + 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(); default: break; } @@ -3358,7 +3358,7 @@ void Scene1337::Action4::signal() { switch (_actionIndex++) { case 0: - if ((scene->_gameBoardSide[scene->_field423E]._arr1[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId))) { + if ((scene->_gameBoardSide[scene->_field423E]._handCard[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId))) { if (scene->_field3E24 < 0) scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId); scene->_item2._card.setPosition(Common::Point(162, 95), 0); @@ -3368,7 +3368,7 @@ void Scene1337::Action4::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &scene->_gameBoardSide[scene->_field423E]._fieldB94, this); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[scene->_field423E]._handCard[0]._cardId = scene->_field3E28[scene->_field3E24]; scene->_field3E28[scene->_field3E24] = 0; scene->_field3E24--; @@ -3382,20 +3382,20 @@ void Scene1337::Action4::signal() { case 1: if ( ( scene->_item2._card._position.x == scene->_gameBoardSide[scene->_field423E]._fieldB94.x) && ( scene->_item2._card._position.y == scene->_gameBoardSide[scene->_field423E]._fieldB94.y) ) { - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card.postInit(); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card.setVisage(1332); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._arr1[0]._stationPos, 0); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card.setStrip(1); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); - scene->_gameBoardSide[scene->_field423E]._arr1[0]._card.fixPriority(170); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card.postInit(); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card.setVisage(1332); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._handCard[0]._stationPos, 0); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card.setStrip(1); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); + scene->_gameBoardSide[scene->_field423E]._handCard[0]._card.fixPriority(170); } if ((scene->_field4248 == 1) || (scene->_field423E == 2)) - scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._arr1[0]); + scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._handCard[0]); scene->_item2._card.hide(); - if ((scene->_gameBoardSide[scene->_field423E]._arr1[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId == 0))) { + if ((scene->_gameBoardSide[scene->_field423E]._handCard[0]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId == 0))) { if (scene->_field3E24 < 0) scene->shuffleCards(); scene->_item2._card.setPosition(Common::Point(162, 95)); @@ -3406,7 +3406,7 @@ void Scene1337::Action4::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &scene->_gameBoardSide[scene->_field423E]._fieldB98, this); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[scene->_field423E]._handCard[1]._cardId = scene->_field3E28[scene->_field3E24]; scene->_field3E28[scene->_field3E24] = 0; scene->_field3E24--; if (scene->_field3E24 < 0) @@ -3417,20 +3417,20 @@ void Scene1337::Action4::signal() { case 2: if ( ( scene->_item2._card._position.x == scene->_gameBoardSide[scene->_field423E]._fieldB98.x) && ( scene->_item2._card._position.y == scene->_gameBoardSide[scene->_field423E]._fieldB98.y) ) { - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card.postInit(); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card.setVisage(1332); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._arr1[1]._stationPos, 0); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card.setStrip(1); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); - scene->_gameBoardSide[scene->_field423E]._arr1[1]._card.fixPriority(170); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card.postInit(); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card.setVisage(1332); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._handCard[1]._stationPos, 0); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card.setStrip(1); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); + scene->_gameBoardSide[scene->_field423E]._handCard[1]._card.fixPriority(170); } if ((scene->_field4248 == 1) || (scene->_field423E == 2)) - scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._arr1[1]); + scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._handCard[1]); scene->_item2._card.hide(); - if ((scene->_gameBoardSide[scene->_field423E]._arr1[2]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId == 0))) { + if ((scene->_gameBoardSide[scene->_field423E]._handCard[2]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId == 0))) { if (scene->_field3E24 < 0) scene->shuffleCards(); scene->_item2._card.setPosition(Common::Point(162, 95)); @@ -3441,7 +3441,7 @@ void Scene1337::Action4::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &scene->_gameBoardSide[scene->_field423E]._fieldB9C, this); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[scene->_field423E]._handCard[2]._cardId = scene->_field3E28[scene->_field3E24]; scene->_field3E28[scene->_field3E24] = 0; scene->_field3E24--; if (scene->_field3E24 < 0) @@ -3452,20 +3452,20 @@ void Scene1337::Action4::signal() { case 3: if ( ( scene->_item2._card._position.x == scene->_gameBoardSide[scene->_field423E]._fieldB9C.x) && ( scene->_item2._card._position.y == scene->_gameBoardSide[scene->_field423E]._fieldB9C.y) ) { - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card.postInit(); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card.setVisage(1332); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._arr1[2]._stationPos, 0); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card.setStrip(1); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); - scene->_gameBoardSide[scene->_field423E]._arr1[2]._card.fixPriority(170); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card.postInit(); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card.setVisage(1332); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._handCard[2]._stationPos, 0); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card.setStrip(1); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); + scene->_gameBoardSide[scene->_field423E]._handCard[2]._card.fixPriority(170); } if ((scene->_field4248 == 1) || (scene->_field423E == 2)) - scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._arr1[2]); + scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._handCard[2]); scene->_item2._card.hide(); - if ((scene->_gameBoardSide[scene->_field423E]._arr1[3]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId == 0))) { + if ((scene->_gameBoardSide[scene->_field423E]._handCard[3]._cardId == 0) && (scene->subC264B(scene->_gameBoardSide[scene->_field423E]._arr3[0]._cardId == 0))) { if (scene->_field3E24 < 0) scene->shuffleCards(); scene->_item2._card.setPosition(Common::Point(162, 95)); @@ -3476,7 +3476,7 @@ void Scene1337::Action4::signal() { NpcMover *mover = new NpcMover(); scene->_item2._card.addMover(mover, &scene->_gameBoardSide[scene->_field423E]._fieldBA0, this); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._cardId = scene->_field3E28[scene->_field3E24]; + scene->_gameBoardSide[scene->_field423E]._handCard[3]._cardId = scene->_field3E28[scene->_field3E24]; scene->_field3E28[scene->_field3E24] = 0; scene->_field3E24--; if (scene->_field3E24 < 0) @@ -3487,17 +3487,17 @@ void Scene1337::Action4::signal() { case 4: if ( ( scene->_item2._card._position.x == scene->_gameBoardSide[scene->_field423E]._fieldBA0.x) && ( scene->_item2._card._position.y == scene->_gameBoardSide[scene->_field423E]._fieldBA0.y) ) { - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card.postInit(); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card._moveDiff = Common::Point(30, 30); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card.setVisage(1332); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._arr1[3]._stationPos, 0); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card.setStrip(1); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); - scene->_gameBoardSide[scene->_field423E]._arr1[3]._card.fixPriority(170); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card.postInit(); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card._moveDiff = Common::Point(30, 30); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card.setVisage(1332); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card.setPosition(scene->_gameBoardSide[scene->_field423E]._handCard[3]._stationPos, 0); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card.setStrip(1); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card.setFrame(scene->_gameBoardSide[scene->_field423E]._fieldBA4); + scene->_gameBoardSide[scene->_field423E]._handCard[3]._card.fixPriority(170); } if ((scene->_field4248 == 1) || (scene->_field423E == 2)) - scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._arr1[3]); + scene->setAnimationInfo(&scene->_gameBoardSide[scene->_field423E]._handCard[3]); scene->_item2._card.hide(); switch (scene->_field423E) { @@ -3747,7 +3747,7 @@ void Scene1337::Action10::signal() { switch (scene->_field4240) { case 0: for (indexFound = 0; indexFound < 3; indexFound++) { - if (scene->_gameBoardSide[0]._arr1[indexFound]._cardId == 29) { + if (scene->_gameBoardSide[0]._handCard[indexFound]._cardId == 29) { found = true; break; } @@ -3755,7 +3755,7 @@ void Scene1337::Action10::signal() { break; case 1: for (indexFound = 0; indexFound < 3; indexFound++) { - if (scene->_gameBoardSide[1]._arr1[indexFound]._cardId == 29) { + if (scene->_gameBoardSide[1]._handCard[indexFound]._cardId == 29) { found = true; break; } @@ -3763,7 +3763,7 @@ void Scene1337::Action10::signal() { break; case 2: for (indexFound = 0; indexFound < 3; indexFound++) { - if (scene->_gameBoardSide[2]._arr1[indexFound]._cardId == 29) { + if (scene->_gameBoardSide[2]._handCard[indexFound]._cardId == 29) { found = true; break; } @@ -3771,7 +3771,7 @@ void Scene1337::Action10::signal() { break; case 3: for (indexFound = 0; indexFound < 3; indexFound++) { - if (scene->_gameBoardSide[3]._arr1[indexFound]._cardId == 29) { + if (scene->_gameBoardSide[3]._handCard[indexFound]._cardId == 29) { found = true; break; } @@ -3786,11 +3786,11 @@ void Scene1337::Action10::signal() { if (found) { switch (scene->_field4240) { case 0: - scene->subC51A0(&scene->_gameBoardSide[0]._arr1[indexFound], scene->_field3EF8); + scene->subC51A0(&scene->_gameBoardSide[0]._handCard[indexFound], scene->_field3EF8); found2 = true; break; case 1: - scene->subC51A0(&scene->_gameBoardSide[1]._arr1[indexFound], scene->_field3EF8); + scene->subC51A0(&scene->_gameBoardSide[1]._handCard[indexFound], scene->_field3EF8); found2 = true; break; case 2: @@ -3798,12 +3798,12 @@ void Scene1337::Action10::signal() { if (MessageDialog::show(USE_INTERCEPTOR, NO_MSG, YES_MSG) == 0) scene->subC4CEC(); else { - scene->subC51A0(&scene->_gameBoardSide[2]._arr1[indexFound], scene->_field3EF8); + scene->subC51A0(&scene->_gameBoardSide[2]._handCard[indexFound], scene->_field3EF8); found2 = true; } break; case 3: - scene->subC51A0(&scene->_gameBoardSide[3]._arr1[indexFound], scene->_field3EF8); + scene->subC51A0(&scene->_gameBoardSide[3]._handCard[indexFound], scene->_field3EF8); found2 = true; break; default: @@ -3917,18 +3917,18 @@ void Scene1337::Action11::signal() { switch (scene->_field4242) { case 0: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[0]._arr1[i]._cardId == 27) { + if (scene->_gameBoardSide[0]._handCard[i]._cardId == 27) { found = true; break; } } if ((found) && (scene->subC3E92(scene->_field4240) != -1)) { - scene->_field3EF0 = &scene->_gameBoardSide[0]._arr1[i]; + scene->_field3EF0 = &scene->_gameBoardSide[0]._handCard[i]; scene->_field3EF4 = &scene->_gameBoardSide[0]._arr4[0]; if (scene->_field4240 != 0) { int tmpVal = scene->subC3E92(scene->_field4240); - scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._arr1[tmpVal]; + scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._handCard[tmpVal]; } scene->_item1.setAction(&scene->_action12); noAction = false; @@ -3936,18 +3936,18 @@ void Scene1337::Action11::signal() { break; case 1: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[1]._arr1[i]._cardId == 27) { + if (scene->_gameBoardSide[1]._handCard[i]._cardId == 27) { found = true; break; } } if ((found) && (scene->subC3E92(scene->_field4240) != -1)) { - scene->_field3EF0 = &scene->_gameBoardSide[1]._arr1[i]; + scene->_field3EF0 = &scene->_gameBoardSide[1]._handCard[i]; scene->_field3EF4 = &scene->_gameBoardSide[1]._arr4[0]; if (scene->_field4240 != 1) { int tmpVal = scene->subC3E92(scene->_field4240); - scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._arr1[tmpVal]; + scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._handCard[tmpVal]; } scene->_item1.setAction(&scene->_action12); noAction = false; @@ -3955,7 +3955,7 @@ void Scene1337::Action11::signal() { break; case 2: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[2]._arr1[i]._cardId == 27) { + if (scene->_gameBoardSide[2]._handCard[i]._cardId == 27) { found = true; break; } @@ -3967,11 +3967,11 @@ void Scene1337::Action11::signal() { scene->subC4CEC(); else { scene->subC4CEC(); - scene->_field3EF0 = &scene->_gameBoardSide[2]._arr1[i]; + scene->_field3EF0 = &scene->_gameBoardSide[2]._handCard[i]; scene->_field3EF4 = &scene->_gameBoardSide[2]._arr4[0]; if (scene->_field4240 != 2) { int tmpVal = scene->subC3E92(scene->_field4240); - scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._arr1[tmpVal]; + scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._handCard[tmpVal]; } scene->_item1.setAction(&scene->_action12); noAction = false; @@ -3980,18 +3980,18 @@ void Scene1337::Action11::signal() { break; case 3: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[3]._arr1[i]._cardId == 27) { + if (scene->_gameBoardSide[3]._handCard[i]._cardId == 27) { found = true; break; } } if ((found) && (scene->subC3E92(scene->_field4240) != -1)) { - scene->_field3EF0 = &scene->_gameBoardSide[3]._arr1[i]; + scene->_field3EF0 = &scene->_gameBoardSide[3]._handCard[i]; scene->_field3EF4 = &scene->_gameBoardSide[3]._arr4[0]; if (scene->_field4240 != 3) { int tmpVal = scene->subC3E92(scene->_field4240); - scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._arr1[tmpVal]; + scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4240]._handCard[tmpVal]; } scene->_item1.setAction(&scene->_action12); noAction = false; @@ -4008,7 +4008,7 @@ void Scene1337::Action11::signal() { int count = 0; if (scene->_field4242 != 2) { for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[scene->_field4242]._arr1[i]._cardId == 0) + if (scene->_gameBoardSide[scene->_field4242]._handCard[i]._cardId == 0) ++count; } } @@ -4045,8 +4045,8 @@ void Scene1337::Action11::signal() { if (scene->_field4242 != 2) { for (i = 0; i <= 3; i++) { - if ((scene->subC2BF8(&scene->_gameBoardSide[scene->_field4242]._arr1[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[scene->_field4242]._arr1[i]._cardId != 0)) { - scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4242]._arr1[i]; + if ((scene->subC2BF8(&scene->_gameBoardSide[scene->_field4242]._handCard[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[scene->_field4242]._handCard[i]._cardId != 0)) { + scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4242]._handCard[i]; found = true; break; } @@ -4058,7 +4058,7 @@ void Scene1337::Action11::signal() { } else { if (scene->_field4242 != 2) { int tmpVal = scene->subC3E92(scene->_field4242); - scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4242]._arr1[tmpVal]; + scene->_field3EF8 = &scene->_gameBoardSide[scene->_field4242]._handCard[tmpVal]; } } } @@ -4143,19 +4143,19 @@ void Scene1337::Action12::signal() { switch (scene->_field4240) { case 0: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[0]._arr1[i]._cardId != 0) + if (scene->_gameBoardSide[0]._handCard[i]._cardId != 0) ++count; } break; case 1: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[3]._arr1[i]._cardId != 0) + if (scene->_gameBoardSide[3]._handCard[i]._cardId != 0) ++count; } break; case 3: for (i = 0; i <= 3; i++) { - if (scene->_gameBoardSide[3]._arr1[i]._cardId != 0) + if (scene->_gameBoardSide[3]._handCard[i]._cardId != 0) ++count; } break; @@ -4194,9 +4194,9 @@ void Scene1337::Action12::signal() { if (scene->_field4240 == 0) { for (i = 0; i <= 3; i++) { - if ((scene->subC2BF8(&scene->_gameBoardSide[0]._arr1[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[0]._arr1[i]._cardId != 0)) { + if ((scene->subC2BF8(&scene->_gameBoardSide[0]._handCard[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[0]._handCard[i]._cardId != 0)) { found = true; - scene->_field3EF8 = &scene->_gameBoardSide[0]._arr1[i]; + scene->_field3EF8 = &scene->_gameBoardSide[0]._handCard[i]; break; } } @@ -4204,9 +4204,9 @@ void Scene1337::Action12::signal() { if (scene->_field4240 == 3) { for (i = 0; i <= 3; i++) { - if ((scene->subC2BF8(&scene->_gameBoardSide[3]._arr1[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[3]._arr1[i]._cardId != 0)) { + if ((scene->subC2BF8(&scene->_gameBoardSide[3]._handCard[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[3]._handCard[i]._cardId != 0)) { found = true; - scene->_field3EF8 = &scene->_gameBoardSide[3]._arr1[i]; + scene->_field3EF8 = &scene->_gameBoardSide[3]._handCard[i]; break; } } @@ -4214,9 +4214,9 @@ void Scene1337::Action12::signal() { if (scene->_field4240 == 1) { for (i = 0; i <= 3; i++) { - if ((scene->subC2BF8(&scene->_gameBoardSide[1]._arr1[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[1]._arr1[i]._cardId != 0)) { + if ((scene->subC2BF8(&scene->_gameBoardSide[1]._handCard[i], scene->_item6._stationPos) != 0) && (scene->_gameBoardSide[1]._handCard[i]._cardId != 0)) { found = true; - scene->_field3EF8 = &scene->_gameBoardSide[1]._arr1[i]; + scene->_field3EF8 = &scene->_gameBoardSide[1]._handCard[i]; break; } } @@ -4227,16 +4227,16 @@ void Scene1337::Action12::signal() { if (scene->_field4240 != 1) { switch (scene->_field4240) { case 0: - scene->_field3EF8 = &scene->_gameBoardSide[0]._arr1[scene->subC3E92(0)]; + scene->_field3EF8 = &scene->_gameBoardSide[0]._handCard[scene->subC3E92(0)]; break; case 3: - scene->_field3EF8 = &scene->_gameBoardSide[3]._arr1[scene->subC3E92(3)]; + scene->_field3EF8 = &scene->_gameBoardSide[3]._handCard[scene->subC3E92(3)]; break; default: break; } } else { - scene->_field3EF8 = &scene->_gameBoardSide[1]._arr1[scene->subC3E92(1)]; + scene->_field3EF8 = &scene->_gameBoardSide[1]._handCard[scene->subC3E92(1)]; } } @@ -4339,10 +4339,10 @@ void Scene1337::postInit(SceneObjectList *OwnerList) { _field3EF4 = NULL; _field3EF8 = NULL; - _gameBoardSide[2]._arr1[0]._stationPos = Common::Point(10, 174); - _gameBoardSide[2]._arr1[1]._stationPos = Common::Point(37, 174); - _gameBoardSide[2]._arr1[2]._stationPos = Common::Point(64, 174); - _gameBoardSide[2]._arr1[3]._stationPos = Common::Point(91, 174); + _gameBoardSide[2]._handCard[0]._stationPos = Common::Point(10, 174); + _gameBoardSide[2]._handCard[1]._stationPos = Common::Point(37, 174); + _gameBoardSide[2]._handCard[2]._stationPos = Common::Point(64, 174); + _gameBoardSide[2]._handCard[3]._stationPos = Common::Point(91, 174); _gameBoardSide[2]._outpostStation[0]._stationPos = Common::Point(119, 174); _gameBoardSide[2]._outpostStation[1]._stationPos = Common::Point(119, 148); @@ -4363,10 +4363,10 @@ void Scene1337::postInit(SceneObjectList *OwnerList) { _gameBoardSide[2]._fieldBA0 = Common::Point(91, 174); _gameBoardSide[2]._fieldBA4 = 2; - _gameBoardSide[3]._arr1[0]._stationPos = Common::Point(14, 14); - _gameBoardSide[3]._arr1[1]._stationPos = Common::Point(14, 36); - _gameBoardSide[3]._arr1[2]._stationPos = Common::Point(14, 58); - _gameBoardSide[3]._arr1[3]._stationPos = Common::Point(14, 80); + _gameBoardSide[3]._handCard[0]._stationPos = Common::Point(14, 14); + _gameBoardSide[3]._handCard[1]._stationPos = Common::Point(14, 36); + _gameBoardSide[3]._handCard[2]._stationPos = Common::Point(14, 58); + _gameBoardSide[3]._handCard[3]._stationPos = Common::Point(14, 80); _gameBoardSide[3]._outpostStation[0]._stationPos = Common::Point(37, 66); _gameBoardSide[3]._outpostStation[1]._stationPos = Common::Point(63, 66); @@ -4387,10 +4387,10 @@ void Scene1337::postInit(SceneObjectList *OwnerList) { _gameBoardSide[3]._fieldBA0 = Common::Point(14, 80); _gameBoardSide[3]._fieldBA4 = 3; - _gameBoardSide[0]._arr1[0]._stationPos = Common::Point(280, 5); - _gameBoardSide[0]._arr1[1]._stationPos = Common::Point(253, 5); - _gameBoardSide[0]._arr1[2]._stationPos = Common::Point(226, 5); - _gameBoardSide[0]._arr1[3]._stationPos = Common::Point(199, 5); + _gameBoardSide[0]._handCard[0]._stationPos = Common::Point(280, 5); + _gameBoardSide[0]._handCard[1]._stationPos = Common::Point(253, 5); + _gameBoardSide[0]._handCard[2]._stationPos = Common::Point(226, 5); + _gameBoardSide[0]._handCard[3]._stationPos = Common::Point(199, 5); _gameBoardSide[0]._outpostStation[0]._stationPos = Common::Point(171, 16); _gameBoardSide[0]._outpostStation[1]._stationPos = Common::Point(171, 42); @@ -4411,10 +4411,10 @@ void Scene1337::postInit(SceneObjectList *OwnerList) { _gameBoardSide[0]._fieldBA0 = Common::Point(199, 5); _gameBoardSide[0]._fieldBA4 = 2; - _gameBoardSide[1]._arr1[0]._stationPos = Common::Point(283, 146); - _gameBoardSide[1]._arr1[1]._stationPos = Common::Point(283, 124); - _gameBoardSide[1]._arr1[2]._stationPos = Common::Point(283, 102); - _gameBoardSide[1]._arr1[3]._stationPos = Common::Point(283, 80); + _gameBoardSide[1]._handCard[0]._stationPos = Common::Point(283, 146); + _gameBoardSide[1]._handCard[1]._stationPos = Common::Point(283, 124); + _gameBoardSide[1]._handCard[2]._stationPos = Common::Point(283, 102); + _gameBoardSide[1]._handCard[3]._stationPos = Common::Point(283, 80); _gameBoardSide[1]._outpostStation[0]._stationPos = Common::Point(253, 122); _gameBoardSide[1]._outpostStation[1]._stationPos = Common::Point(227, 122); @@ -4659,7 +4659,7 @@ bool Scene1337::subC2687(int arg1) { } int Scene1337::subC26CB(int arg1, int arg2) { - if ((_gameBoardSide[arg1]._arr1[arg2]._cardId > 1) && (_gameBoardSide[arg1]._arr1[arg2]._cardId <= 9)) { + if ((_gameBoardSide[arg1]._handCard[arg2]._cardId > 1) && (_gameBoardSide[arg1]._handCard[arg2]._cardId <= 9)) { return arg2; } @@ -4668,7 +4668,7 @@ int Scene1337::subC26CB(int arg1, int arg2) { int Scene1337::subC2719(int arg1) { for (int i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 1) + if (_gameBoardSide[arg1]._handCard[i]._cardId == 1) return i; } @@ -4677,7 +4677,7 @@ int Scene1337::subC2719(int arg1) { int Scene1337::subC274D(int arg1) { for (int i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 13) + if (_gameBoardSide[arg1]._handCard[i]._cardId == 13) return i; } @@ -4686,7 +4686,7 @@ int Scene1337::subC274D(int arg1) { int Scene1337::subC2781(int arg1) { for (int i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 25) + if (_gameBoardSide[arg1]._handCard[i]._cardId == 25) return i; } @@ -4739,7 +4739,7 @@ void Scene1337::subC2835(int arg1) { switch (arg1) { case 0: for (i = 0; i <= 3; i++) { - if (subC27F9(_gameBoardSide[arg1]._arr1[i]._cardId) != -1) { + if (subC27F9(_gameBoardSide[arg1]._handCard[i]._cardId) != -1) { found = true; break; } @@ -4749,7 +4749,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (subC27B5(_gameBoardSide[arg1]._arr1[i]._cardId) != -1) { + if (subC27B5(_gameBoardSide[arg1]._handCard[i]._cardId) != -1) { found = true; break; } @@ -4759,7 +4759,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if ((_gameBoardSide[arg1]._arr1[i]._cardId > 1) && (_gameBoardSide[arg1]._arr1[i]._cardId <= 9)) { + if ((_gameBoardSide[arg1]._handCard[i]._cardId > 1) && (_gameBoardSide[arg1]._handCard[i]._cardId <= 9)) { found = true; break; } @@ -4769,7 +4769,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if ((_gameBoardSide[arg1]._arr1[i]._cardId >= 26) && (_gameBoardSide[arg1]._arr1[i]._cardId <= 33)) { + if ((_gameBoardSide[arg1]._handCard[i]._cardId >= 26) && (_gameBoardSide[arg1]._handCard[i]._cardId <= 33)) { found = true; break; } @@ -4779,7 +4779,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 1) { + if (_gameBoardSide[arg1]._handCard[i]._cardId == 1) { found = true; break; } @@ -4789,7 +4789,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 25) { + if (_gameBoardSide[arg1]._handCard[i]._cardId == 25) { found = true; break; } @@ -4799,7 +4799,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 13) { + if (_gameBoardSide[arg1]._handCard[i]._cardId == 13) { found = true; break; } @@ -4807,7 +4807,7 @@ void Scene1337::subC2835(int arg1) { break; case 1: for (i = 0; i <= 3; i++) { - if ((_gameBoardSide[arg1]._arr1[i]._cardId >= 26) && (_gameBoardSide[arg1]._arr1[i]._cardId <= 33)) { + if ((_gameBoardSide[arg1]._handCard[i]._cardId >= 26) && (_gameBoardSide[arg1]._handCard[i]._cardId <= 33)) { found = true; break; } @@ -4817,7 +4817,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 1) { + if (_gameBoardSide[arg1]._handCard[i]._cardId == 1) { found = true; break; } @@ -4827,7 +4827,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if ((_gameBoardSide[arg1]._arr1[i]._cardId > 1) && (_gameBoardSide[arg1]._arr1[i]._cardId <= 9)) { + if ((_gameBoardSide[arg1]._handCard[i]._cardId > 1) && (_gameBoardSide[arg1]._handCard[i]._cardId <= 9)) { found = true; break; } @@ -4837,7 +4837,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (subC27F9(_gameBoardSide[arg1]._arr1[i]._cardId) != -1) { + if (subC27F9(_gameBoardSide[arg1]._handCard[i]._cardId) != -1) { found = true; break; } @@ -4847,7 +4847,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (subC27B5(_gameBoardSide[arg1]._arr1[i]._cardId) != -1) { + if (subC27B5(_gameBoardSide[arg1]._handCard[i]._cardId) != -1) { found = true; break; } @@ -4857,7 +4857,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 25) { + if (_gameBoardSide[arg1]._handCard[i]._cardId == 25) { found = true; break; } @@ -4867,7 +4867,7 @@ void Scene1337::subC2835(int arg1) { break; for (i = 0; i <= 3; i++) { - if (_gameBoardSide[arg1]._arr1[i]._cardId == 13) { + if (_gameBoardSide[arg1]._handCard[i]._cardId == 13) { found = true; break; } @@ -4878,7 +4878,7 @@ void Scene1337::subC2835(int arg1) { return; } - subC4A39(&_gameBoardSide[arg1]._arr1[i]); + subC4A39(&_gameBoardSide[arg1]._handCard[i]); } bool Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point pt) { @@ -4918,7 +4918,7 @@ void Scene1337::subC2C2F() { found = false; int i; for (i = 0; i <= 3; i++) { - if (subC3386(_gameBoardSide[3]._arr3[0]._cardId, _gameBoardSide[3]._arr1[i]._cardId)) { + if (subC3386(_gameBoardSide[3]._arr3[0]._cardId, _gameBoardSide[3]._handCard[i]._cardId)) { found = true; break; } @@ -4926,7 +4926,7 @@ void Scene1337::subC2C2F() { if (found) { found = false; - subC34A1(&_gameBoardSide[3]._arr1[i], &_gameBoardSide[3]._arr3[0]); + subC34A1(&_gameBoardSide[3]._handCard[i], &_gameBoardSide[3]._arr3[0]); } break; } @@ -4937,12 +4937,12 @@ void Scene1337::subC2C2F() { int randIndx = R2_GLOBALS._randomSource.getRandomNumber(3); - if (_gameBoardSide[3]._arr1[randIndx]._cardId == 1) { + if (_gameBoardSide[3]._handCard[randIndx]._cardId == 1) { found = false; for (int i = 0; i <= 7; i++) { if ((_gameBoardSide[3]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[3]._arr3[0]._cardId))) { - subC340B(&_gameBoardSide[3]._arr1[randIndx], &_gameBoardSide[3]._outpostStation[i]); + subC340B(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[3]._outpostStation[i]); found = true; break; } @@ -4951,11 +4951,11 @@ void Scene1337::subC2C2F() { if (found) { return; } - } else if (_gameBoardSide[3]._arr1[randIndx]._cardId <= 9) { + } else if (_gameBoardSide[3]._handCard[randIndx]._cardId <= 9) { found = false; for (int i = 0; i <= 7; i++) { - if (_gameBoardSide[3]._outpostStation[i]._cardId == _gameBoardSide[3]._arr1[randIndx]._cardId) { + if (_gameBoardSide[3]._outpostStation[i]._cardId == _gameBoardSide[3]._handCard[randIndx]._cardId) { found = true; break; } @@ -4974,7 +4974,7 @@ void Scene1337::subC2C2F() { if (tmpVal == 7) _field424A = 3; - subC33C0(&_gameBoardSide[3]._arr1[randIndx], &_gameBoardSide[3]._outpostStation[i]); + subC33C0(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[3]._outpostStation[i]); found = true; break; } @@ -4982,24 +4982,24 @@ void Scene1337::subC2C2F() { if (found) return; } - } else if (_gameBoardSide[3]._arr1[randIndx]._cardId == 13) { + } else if (_gameBoardSide[3]._handCard[randIndx]._cardId == 13) { int tmpVal = subC331B(3); if (tmpVal != -1) { - subC358E(&_gameBoardSide[3]._arr1[randIndx], tmpVal); + subC358E(&_gameBoardSide[3]._handCard[randIndx], tmpVal); return; } - } else if (_gameBoardSide[3]._arr1[randIndx]._cardId == 25) { + } else if (_gameBoardSide[3]._handCard[randIndx]._cardId == 25) { int tmpVal = -1; found = false; int tmpRandIndx = R2_GLOBALS._randomSource.getRandomNumber(3); for (int i = 0; i <= 3; i++) { if ( (tmpRandIndx != 3) - && ( (_gameBoardSide[tmpRandIndx]._arr1[0]._cardId != 0) - || (_gameBoardSide[tmpRandIndx]._arr1[1]._cardId != 0) - || (_gameBoardSide[tmpRandIndx]._arr1[2]._cardId != 0) - || (_gameBoardSide[tmpRandIndx]._arr1[3]._cardId != 0) )) { + && ( (_gameBoardSide[tmpRandIndx]._handCard[0]._cardId != 0) + || (_gameBoardSide[tmpRandIndx]._handCard[1]._cardId != 0) + || (_gameBoardSide[tmpRandIndx]._handCard[2]._cardId != 0) + || (_gameBoardSide[tmpRandIndx]._handCard[3]._cardId != 0) )) { tmpVal = tmpRandIndx; break; } @@ -5010,11 +5010,11 @@ void Scene1337::subC2C2F() { } if (tmpVal != -1) { - subC318B(3, &_gameBoardSide[3]._arr1[randIndx], tmpVal); + subC318B(3, &_gameBoardSide[3]._handCard[randIndx], tmpVal); return; } } else { - switch (_gameBoardSide[3]._arr1[randIndx]._cardId) { + switch (_gameBoardSide[3]._handCard[randIndx]._cardId) { case 10: // No break on purpose case 11: @@ -5047,7 +5047,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]._arr3[0]._cardId == 0) && (subC32B1(tmpRandIndx, _gameBoardSide[3]._arr1[randIndx]._cardId))) { + if ((_gameBoardSide[tmpRandIndx]._arr3[0]._cardId == 0) && (subC32B1(tmpRandIndx, _gameBoardSide[3]._handCard[randIndx]._cardId))) { tmpVal = j; } } @@ -5063,7 +5063,7 @@ void Scene1337::subC2C2F() { if (tmpVal != -1) { // Useless second identical check skipped - subC3456(&_gameBoardSide[3]._arr1[randIndx], &_gameBoardSide[tmpVal]._arr3[0]); + subC3456(&_gameBoardSide[3]._handCard[randIndx], &_gameBoardSide[tmpVal]._arr3[0]); return; } } @@ -5072,7 +5072,7 @@ void Scene1337::subC2C2F() { } } - subC4A39(&_gameBoardSide[3]._arr1[randIndx]); + subC4A39(&_gameBoardSide[3]._handCard[randIndx]); } void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj1, int arg3) { @@ -5083,13 +5083,13 @@ void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj1, int arg3) { for (;;) { randIndx = R2_GLOBALS._randomSource.getRandomNumber(3); - if (_gameBoardSide[arg3]._arr1[randIndx]._cardId != 0) + if (_gameBoardSide[arg3]._handCard[randIndx]._cardId != 0) break; } _field3EF0 = subObj1; _field3EF4 = &_gameBoardSide[arg3]._arr4[0]; - _field3EF8 = &_gameBoardSide[arg3]._arr1[randIndx]; + _field3EF8 = &_gameBoardSide[arg3]._handCard[randIndx]; _item1.setAction(&_action11); } @@ -5188,16 +5188,16 @@ void Scene1337::subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) { } int Scene1337::subC3E92(int arg1) { - if ( (_gameBoardSide[arg1]._arr1[0]._cardId == 0) - && (_gameBoardSide[arg1]._arr1[1]._cardId == 0) - && (_gameBoardSide[arg1]._arr1[2]._cardId == 0) - && (_gameBoardSide[arg1]._arr1[3]._cardId == 0)) + if ( (_gameBoardSide[arg1]._handCard[0]._cardId == 0) + && (_gameBoardSide[arg1]._handCard[1]._cardId == 0) + && (_gameBoardSide[arg1]._handCard[2]._cardId == 0) + && (_gameBoardSide[arg1]._handCard[3]._cardId == 0)) return -1; int randIndx; for (;;) { randIndx = R2_GLOBALS._randomSource.getRandomNumber(3); - if (_gameBoardSide[arg1]._arr1[randIndx]._cardId == 0) + if (_gameBoardSide[arg1]._handCard[randIndx]._cardId == 0) break; } @@ -5706,14 +5706,14 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) { || (subC2BF8(&_gameBoardSide[1]._arr4[0], pt)) ) { actionDisplay(1330, 32, 159, 10, 1, 200, 0, 7, 0, 154, 154); } else { - if (subC2BF8(&_gameBoardSide[2]._arr1[0], pt)) - displayDialog(_gameBoardSide[2]._arr1[0]._cardId); - else if (subC2BF8(&_gameBoardSide[2]._arr1[1], pt)) - displayDialog(_gameBoardSide[2]._arr1[1]._cardId); - else if (subC2BF8(&_gameBoardSide[2]._arr1[2], pt)) - displayDialog(_gameBoardSide[2]._arr1[2]._cardId); - else if (subC2BF8(&_gameBoardSide[2]._arr1[3], pt)) - displayDialog(_gameBoardSide[2]._arr1[3]._cardId); + if (subC2BF8(&_gameBoardSide[2]._handCard[0], pt)) + displayDialog(_gameBoardSide[2]._handCard[0]._cardId); + else if (subC2BF8(&_gameBoardSide[2]._handCard[1], pt)) + displayDialog(_gameBoardSide[2]._handCard[1]._cardId); + else if (subC2BF8(&_gameBoardSide[2]._handCard[2], pt)) + displayDialog(_gameBoardSide[2]._handCard[2]._cardId); + else if (subC2BF8(&_gameBoardSide[2]._handCard[3], pt)) + displayDialog(_gameBoardSide[2]._handCard[3]._cardId); else if ((curReg >= 6) && (curReg <= 9)) actionDisplay(1330, 29, 159, 10, 1, 200, 0, 7, 0, 154, 154); else if ((curReg >= 11) && (curReg <= 14)) @@ -5940,7 +5940,7 @@ void Scene1337::subCF31D() { found = false; int i; for (i = 0; i <= 3; i++) { - if (subC3386(_gameBoardSide[1]._arr3[0]._cardId, _gameBoardSide[1]._arr1[i]._cardId)) { + if (subC3386(_gameBoardSide[1]._arr3[0]._cardId, _gameBoardSide[1]._handCard[i]._cardId)) { found = true; break; } @@ -5948,7 +5948,7 @@ void Scene1337::subCF31D() { if (found) { tmpVal = 0; - subC34A1(&_gameBoardSide[1]._arr1[i], &_gameBoardSide[1]._arr3[0]); + subC34A1(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[1]._arr3[0]); } } } @@ -5964,7 +5964,7 @@ void Scene1337::subCF31D() { tmpVal = 0; for (int j = 0; j <= 7; j++) { - if (_gameBoardSide[1]._outpostStation[j]._cardId == _gameBoardSide[1]._arr1[tmpIndx]._cardId) { + if (_gameBoardSide[1]._outpostStation[j]._cardId == _gameBoardSide[1]._handCard[tmpIndx]._cardId) { tmpVal = 1; break; } @@ -5985,7 +5985,7 @@ void Scene1337::subCF31D() { if (count == 7) _field424A = 1; - subC33C0(&_gameBoardSide[1]._arr1[tmpIndx], &_gameBoardSide[1]._outpostStation[j]); + subC33C0(&_gameBoardSide[1]._handCard[tmpIndx], &_gameBoardSide[1]._outpostStation[j]); found = true; break; } @@ -6000,7 +6000,7 @@ void Scene1337::subCF31D() { if (tmpVal != -1) { for (int i = 0; i <= 7; i++) { if ((_gameBoardSide[1]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[1]._arr3[0]._cardId))) { - subC340B(&_gameBoardSide[1]._arr1[tmpVal], &_gameBoardSide[1]._outpostStation[i]); + subC340B(&_gameBoardSide[1]._handCard[tmpVal], &_gameBoardSide[1]._outpostStation[i]); found = true; break; } @@ -6014,7 +6014,7 @@ void Scene1337::subCF31D() { int tmpVal2 = subC331B(1); if ((tmpVal != -1) && ( tmpVal2 != -1)) { - subC358E(&_gameBoardSide[1]._arr1[tmpVal], tmpVal2); + subC358E(&_gameBoardSide[1]._handCard[tmpVal], tmpVal2); found = true; } @@ -6027,10 +6027,10 @@ void Scene1337::subCF31D() { int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3); for (int i = 0; i <= 3; i++) { if (rndVal != 1) { - if ( (_gameBoardSide[rndVal]._arr1[0]._cardId != 0) - || (_gameBoardSide[rndVal]._arr1[1]._cardId != 0) - || (_gameBoardSide[rndVal]._arr1[2]._cardId != 0) - || (_gameBoardSide[rndVal]._arr1[3]._cardId == 0)) { + if ( (_gameBoardSide[rndVal]._handCard[0]._cardId != 0) + || (_gameBoardSide[rndVal]._handCard[1]._cardId != 0) + || (_gameBoardSide[rndVal]._handCard[2]._cardId != 0) + || (_gameBoardSide[rndVal]._handCard[3]._cardId == 0)) { count = rndVal; break; } @@ -6042,7 +6042,7 @@ void Scene1337::subCF31D() { } if (count != -1) { - subC318B(1, &_gameBoardSide[1]._arr1[tmpVal], count); + subC318B(1, &_gameBoardSide[1]._handCard[tmpVal], count); found = true; } } @@ -6053,7 +6053,7 @@ void Scene1337::subCF31D() { count = -1; int i; for (i = 0; i <= 3; i++) { - tmpVal = subC27B5(_gameBoardSide[1]._arr1[i]._cardId); + tmpVal = subC27B5(_gameBoardSide[1]._handCard[i]._cardId); if (tmpVal != -1) { int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3); @@ -6063,7 +6063,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]._arr3[0]._cardId == 0) && (subC32B1(tmpVal, _gameBoardSide[1]._arr1[i]._cardId))) { + if ((_gameBoardSide[tmpVal]._arr3[0]._cardId == 0) && (subC32B1(tmpVal, _gameBoardSide[1]._handCard[i]._cardId))) { count = tmpVal; break; } @@ -6086,18 +6086,18 @@ void Scene1337::subCF31D() { } if (found) - subC3456(&_gameBoardSide[1]._arr1[i], &_gameBoardSide[count]._arr3[0]); + subC3456(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[count]._arr3[0]); else { int j; for (j = 0; j <= 3; j++) { - if (subC27F9(_gameBoardSide[1]._arr1[j]._cardId) != -1) { + if (subC27F9(_gameBoardSide[1]._handCard[j]._cardId) != -1) { count = -1; int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3); for (int l = 0; l <= 3; l++) { if (rndVal != 1) { for (int m = 0; m <= 7; m++) { // 'm' is not used in that loop. It looks suspicious. - if ((_gameBoardSide[rndVal]._arr3[0]._cardId == 0) && (_gameBoardSide[1]._arr1[j]._cardId == 1)) { + if ((_gameBoardSide[rndVal]._arr3[0]._cardId == 0) && (_gameBoardSide[1]._handCard[j]._cardId == 1)) { count = rndVal; break; } @@ -6118,7 +6118,7 @@ void Scene1337::subCF31D() { } if (found) - subC3456(&_gameBoardSide[1]._arr1[j], &_gameBoardSide[count]._arr3[0]); + subC3456(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[count]._arr3[0]); else subC2835(1); } @@ -6153,7 +6153,7 @@ void Scene1337::subCF979() { found = false; for (i = 0; i <= 3; i++) { - if (subC3386(_gameBoardSide[0]._arr3[0]._cardId, _gameBoardSide[0]._arr1[i]._cardId)) { + if (subC3386(_gameBoardSide[0]._arr3[0]._cardId, _gameBoardSide[0]._handCard[i]._cardId)) { found = true; break; } @@ -6161,7 +6161,7 @@ void Scene1337::subCF979() { if (found) { found = false; - subC34A1(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[0]._arr3[0]); + subC34A1(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[0]._arr3[0]); } break; } @@ -6178,7 +6178,7 @@ void Scene1337::subCF979() { if (tmpVal != -1) { bool flag = false; for (int j = 0; j <= 7; j++) { - if (_gameBoardSide[0]._outpostStation[j]._cardId == _gameBoardSide[0]._arr1[tmpVal]._cardId) { + if (_gameBoardSide[0]._outpostStation[j]._cardId == _gameBoardSide[0]._handCard[tmpVal]._cardId) { flag = true; break; } @@ -6197,7 +6197,7 @@ void Scene1337::subCF979() { if (count == 7) _field424A = 0; - subC33C0(&_gameBoardSide[0]._arr1[tmpVal], &_gameBoardSide[0]._outpostStation[j]); + subC33C0(&_gameBoardSide[0]._handCard[tmpVal], &_gameBoardSide[0]._outpostStation[j]); found = true; } } @@ -6217,7 +6217,7 @@ void Scene1337::subCF979() { if (tmpVal != -1) { for (int i = 0; i <= 7; i++) { if ((_gameBoardSide[0]._outpostStation[i]._cardId == 0) && (!subC2687(_gameBoardSide[0]._arr3[0]._cardId))) { - subC340B(&_gameBoardSide[0]._arr1[tmpVal], &_gameBoardSide[0]._outpostStation[i]); + subC340B(&_gameBoardSide[0]._handCard[tmpVal], &_gameBoardSide[0]._outpostStation[i]); found = true; break; } @@ -6231,7 +6231,7 @@ void Scene1337::subCF979() { if (tmpVal != -1) { for (int i = 0; i <= 7; i++) { if (_gameBoardSide[2]._outpostStation[i]._cardId != 0) { - subC358E(&_gameBoardSide[0]._arr1[tmpVal], 2); + subC358E(&_gameBoardSide[0]._handCard[tmpVal], 2); found = true; break; } @@ -6243,11 +6243,11 @@ void Scene1337::subCF979() { tmpVal = subC2781(0); if (tmpVal != -1) { - if ( (_gameBoardSide[2]._arr1[0]._cardId != 0) - || (_gameBoardSide[2]._arr1[1]._cardId != 0) - || (_gameBoardSide[2]._arr1[2]._cardId != 0) - || (_gameBoardSide[2]._arr1[3]._cardId != 0) ) { - subC318B(0, &_gameBoardSide[0]._arr1[tmpVal], 2); + if ( (_gameBoardSide[2]._handCard[0]._cardId != 0) + || (_gameBoardSide[2]._handCard[1]._cardId != 0) + || (_gameBoardSide[2]._handCard[2]._cardId != 0) + || (_gameBoardSide[2]._handCard[3]._cardId != 0) ) { + subC318B(0, &_gameBoardSide[0]._handCard[tmpVal], 2); found = true; } } @@ -6256,11 +6256,11 @@ void Scene1337::subCF979() { return; for (int i = 0; i <= 3; i++) { - if (subC27B5(_gameBoardSide[0]._arr1[i]._cardId) != -1) { + 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]._arr3[0]._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._arr1[i]._cardId))) { - subC3456(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[2]._arr3[0]); + if ((_gameBoardSide[2]._arr3[0]._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._handCard[i]._cardId))) { + subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[2]._arr3[0]); found = true; break; } @@ -6275,11 +6275,11 @@ void Scene1337::subCF979() { return; for (int i = 0; i <= 3; i++) { - if (subC27F9(_gameBoardSide[0]._arr1[i]._cardId) != -1) { + 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]._arr3[0]._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._arr1[i]._cardId))) { - subC3456(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[2]._arr3[0]); + if ((_gameBoardSide[2]._arr3[0]._cardId == 0) && (subC32B1(2, _gameBoardSide[0]._handCard[i]._cardId))) { + subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[2]._arr3[0]); found = true; } } @@ -6296,7 +6296,7 @@ void Scene1337::subCF979() { int tmpVal2 = subC331B(0); if ((tmpVal != -1) && (tmpVal2 != -1)) { - subC358E(&_gameBoardSide[0]._arr1[tmpVal], tmpVal2); + subC358E(&_gameBoardSide[0]._handCard[tmpVal], tmpVal2); found = true; } @@ -6305,11 +6305,11 @@ void Scene1337::subCF979() { tmpVal = subC2781(0); if (tmpVal != -1) { - if ( (_gameBoardSide[1]._arr1[0]._cardId != 0) - || (_gameBoardSide[1]._arr1[1]._cardId != 0) - || (_gameBoardSide[1]._arr1[2]._cardId != 0) - || (_gameBoardSide[1]._arr1[3]._cardId != 0) ) { - subC318B(0, &_gameBoardSide[0]._arr1[tmpVal], 1); + if ( (_gameBoardSide[1]._handCard[0]._cardId != 0) + || (_gameBoardSide[1]._handCard[1]._cardId != 0) + || (_gameBoardSide[1]._handCard[2]._cardId != 0) + || (_gameBoardSide[1]._handCard[3]._cardId != 0) ) { + subC318B(0, &_gameBoardSide[0]._handCard[tmpVal], 1); found = true; } } @@ -6318,12 +6318,12 @@ void Scene1337::subCF979() { return; for (int i = 0; i <= 3; i++) { - tmpVal = subC27F9(_gameBoardSide[0]._arr1[i]._cardId); + tmpVal = subC27F9(_gameBoardSide[0]._handCard[i]._cardId); 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]._arr3[0]._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._arr1[i]._cardId))) { - subC3456(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[1]._arr3[0]); + if ((_gameBoardSide[1]._arr3[0]._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._handCard[i]._cardId))) { + subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[1]._arr3[0]); found = true; } } @@ -6331,8 +6331,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]._arr3[0]._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._arr1[i]._cardId))) { - subC3456(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[3]._arr3[0]); + if ((_gameBoardSide[3]._arr3[0]._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._handCard[i]._cardId))) { + subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[3]._arr3[0]); found = true; } } @@ -6347,12 +6347,12 @@ void Scene1337::subCF979() { return; for (int i = 0; i <= 3; i++) { - tmpVal = subC27B5(_gameBoardSide[0]._arr1[i]._cardId); + tmpVal = subC27B5(_gameBoardSide[0]._handCard[i]._cardId); 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]._arr3[0]._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._arr1[i]._cardId))) { - subC3456(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[1]._arr3[0]); + if ((_gameBoardSide[1]._arr3[0]._cardId == 0) && (subC32B1(1, _gameBoardSide[0]._handCard[i]._cardId))) { + subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[1]._arr3[0]); found = true; } } @@ -6360,8 +6360,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]._arr3[0]._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._arr1[i]._cardId))) { - subC3456(&_gameBoardSide[0]._arr1[i], &_gameBoardSide[3]._arr3[0]); + if ((_gameBoardSide[3]._arr3[0]._cardId == 0) && (subC32B1(3, _gameBoardSide[0]._handCard[i]._cardId))) { + subC3456(&_gameBoardSide[0]._handCard[i], &_gameBoardSide[3]._arr3[0]); found = true; } } @@ -6395,61 +6395,61 @@ void Scene1337::subD02CA() { if (R2_GLOBALS._v57810 == 200) { int di; for (di = 0; di < 4; di++) { - if ((subC2BF8(&_gameBoardSide[2]._arr1[di], _item6._stationPos) != 0) && (_gameBoardSide[2]._arr1[di]._cardId != 0)) { - _item6._cardId = _gameBoardSide[2]._arr1[di]._cardId; - _item6._stationPos = _gameBoardSide[2]._arr1[di]._stationPos; + if ((subC2BF8(&_gameBoardSide[2]._handCard[di], _item6._stationPos) != 0) && (_gameBoardSide[2]._handCard[di]._cardId != 0)) { + _item6._cardId = _gameBoardSide[2]._handCard[di]._cardId; + _item6._stationPos = _gameBoardSide[2]._handCard[di]._stationPos; // _item6._actorName = _arrunkObj1337[2]._arr1[di]._actorName; - _item6._fieldE = _gameBoardSide[2]._arr1[di]._fieldE; - _item6._field10 = _gameBoardSide[2]._arr1[di]._field10; + _item6._fieldE = _gameBoardSide[2]._handCard[di]._fieldE; + _item6._field10 = _gameBoardSide[2]._handCard[di]._field10; warning("_item6._field12 = _arrunkObj1337[2]._arr1[di]._field12;"); warning("_item6._field14 = _arrunkObj1337[2]._arr1[di]._field14;"); warning("_item6._field16 = _arrunkObj1337[2]._arr1[di]._field16;"); - _item6._sceneRegionId = _gameBoardSide[2]._arr1[di]._sceneRegionId; - _item6._position = _gameBoardSide[2]._arr1[di]._position; - _item6._yDiff = _gameBoardSide[2]._arr1[di]._yDiff; - _item6._bounds = _gameBoardSide[2]._arr1[di]._bounds; - _item6._resNum = _gameBoardSide[2]._arr1[di]._resNum; - _item6._lookLineNum = _gameBoardSide[2]._arr1[di]._lookLineNum; - _item6._talkLineNum = _gameBoardSide[2]._arr1[di]._talkLineNum; - _item6._useLineNum = _gameBoardSide[2]._arr1[di]._useLineNum; - _item6._action = _gameBoardSide[2]._arr1[di]._action; + _item6._sceneRegionId = _gameBoardSide[2]._handCard[di]._sceneRegionId; + _item6._position = _gameBoardSide[2]._handCard[di]._position; + _item6._yDiff = _gameBoardSide[2]._handCard[di]._yDiff; + _item6._bounds = _gameBoardSide[2]._handCard[di]._bounds; + _item6._resNum = _gameBoardSide[2]._handCard[di]._resNum; + _item6._lookLineNum = _gameBoardSide[2]._handCard[di]._lookLineNum; + _item6._talkLineNum = _gameBoardSide[2]._handCard[di]._talkLineNum; + _item6._useLineNum = _gameBoardSide[2]._handCard[di]._useLineNum; + _item6._action = _gameBoardSide[2]._handCard[di]._action; warning("_item6._field0 = _arrunkObj1337[2]._arr1[di]._field0;"); - _item6._card._updateStartFrame = _gameBoardSide[2]._arr1[di]._card._updateStartFrame; - _item6._card._walkStartFrame = _gameBoardSide[2]._arr1[di]._card._walkStartFrame; + _item6._card._updateStartFrame = _gameBoardSide[2]._handCard[di]._card._updateStartFrame; + _item6._card._walkStartFrame = _gameBoardSide[2]._handCard[di]._card._walkStartFrame; // _field2E is named _field3C in R2R - _item6._card._field2E = _gameBoardSide[2]._arr1[di]._card._field2E; - _item6._card._percent = _gameBoardSide[2]._arr1[di]._card._percent; - _item6._card._priority = _gameBoardSide[2]._arr1[di]._card._priority; - _item6._card._angle = _gameBoardSide[2]._arr1[di]._card._angle; - _item6._card._flags = _gameBoardSide[2]._arr1[di]._card._flags; - _item6._card._xe = _gameBoardSide[2]._arr1[di]._card._xe; - _item6._card._xs = _gameBoardSide[2]._arr1[di]._card._xs; - _item6._card._paneRects[0] = _gameBoardSide[2]._arr1[di]._card._paneRects[0]; - _item6._card._paneRects[1] = _gameBoardSide[2]._arr1[di]._card._paneRects[1]; - _item6._card._visage = _gameBoardSide[2]._arr1[di]._card._visage; - _item6._card._objectWrapper = _gameBoardSide[2]._arr1[di]._card._objectWrapper; - _item6._card._strip = _gameBoardSide[2]._arr1[di]._card._strip; - _item6._card._animateMode = _gameBoardSide[2]._arr1[di]._card._animateMode; - _item6._card._frame = _gameBoardSide[2]._arr1[di]._card._frame; - _item6._card._endFrame = _gameBoardSide[2]._arr1[di]._card._endFrame; + _item6._card._field2E = _gameBoardSide[2]._handCard[di]._card._field2E; + _item6._card._percent = _gameBoardSide[2]._handCard[di]._card._percent; + _item6._card._priority = _gameBoardSide[2]._handCard[di]._card._priority; + _item6._card._angle = _gameBoardSide[2]._handCard[di]._card._angle; + _item6._card._flags = _gameBoardSide[2]._handCard[di]._card._flags; + _item6._card._xe = _gameBoardSide[2]._handCard[di]._card._xe; + _item6._card._xs = _gameBoardSide[2]._handCard[di]._card._xs; + _item6._card._paneRects[0] = _gameBoardSide[2]._handCard[di]._card._paneRects[0]; + _item6._card._paneRects[1] = _gameBoardSide[2]._handCard[di]._card._paneRects[1]; + _item6._card._visage = _gameBoardSide[2]._handCard[di]._card._visage; + _item6._card._objectWrapper = _gameBoardSide[2]._handCard[di]._card._objectWrapper; + _item6._card._strip = _gameBoardSide[2]._handCard[di]._card._strip; + _item6._card._animateMode = _gameBoardSide[2]._handCard[di]._card._animateMode; + _item6._card._frame = _gameBoardSide[2]._handCard[di]._card._frame; + _item6._card._endFrame = _gameBoardSide[2]._handCard[di]._card._endFrame; // _field68 is named _field76 in R2R - _item6._card._field68 = _gameBoardSide[2]._arr1[di]._card._field68; - _item6._card._frameChange = _gameBoardSide[2]._arr1[di]._card._frameChange; - _item6._card._numFrames = _gameBoardSide[2]._arr1[di]._card._numFrames; - _item6._card._regionIndex = _gameBoardSide[2]._arr1[di]._card._regionIndex; - _item6._card._mover = _gameBoardSide[2]._arr1[di]._card._mover; - _item6._card._moveDiff = _gameBoardSide[2]._arr1[di]._card._moveDiff; - _item6._card._moveRate = _gameBoardSide[2]._arr1[di]._card._moveRate; - _item6._card._actorDestPos = _gameBoardSide[2]._arr1[di]._card._actorDestPos; - _item6._card._endAction = _gameBoardSide[2]._arr1[di]._card._endAction; - _item6._card._regionBitList = _gameBoardSide[2]._arr1[di]._card._regionBitList; + _item6._card._field68 = _gameBoardSide[2]._handCard[di]._card._field68; + _item6._card._frameChange = _gameBoardSide[2]._handCard[di]._card._frameChange; + _item6._card._numFrames = _gameBoardSide[2]._handCard[di]._card._numFrames; + _item6._card._regionIndex = _gameBoardSide[2]._handCard[di]._card._regionIndex; + _item6._card._mover = _gameBoardSide[2]._handCard[di]._card._mover; + _item6._card._moveDiff = _gameBoardSide[2]._handCard[di]._card._moveDiff; + _item6._card._moveRate = _gameBoardSide[2]._handCard[di]._card._moveRate; + _item6._card._actorDestPos = _gameBoardSide[2]._handCard[di]._card._actorDestPos; + _item6._card._endAction = _gameBoardSide[2]._handCard[di]._card._endAction; + _item6._card._regionBitList = _gameBoardSide[2]._handCard[di]._card._regionBitList; // _item6._object1._actorName = _arrunkObj1337[2]._arr1[di]._object1._actorName; - _item6._card._fieldE = _gameBoardSide[2]._arr1[di]._card._fieldE; - _item6._card._field10 = _gameBoardSide[2]._arr1[di]._card._field10; + _item6._card._fieldE = _gameBoardSide[2]._handCard[di]._card._fieldE; + _item6._card._field10 = _gameBoardSide[2]._handCard[di]._card._field10; warning("_item6._object1._field12 = _arrunkObj1337[2]._arr1[di]._object1._field12;"); warning("_item6._object1._field14 = _arrunkObj1337[2]._arr1[di]._object1._field14;"); warning("_item6._object1._field16 = _arrunkObj1337[2]._arr1[di]._object1._field16;"); - _item6._card = _gameBoardSide[2]._arr1[di]._card; + _item6._card = _gameBoardSide[2]._handCard[di]._card; } } @@ -6481,15 +6481,15 @@ void Scene1337::subD02CA() { found_di = false; for (int i = 0; i <= 3; i ++) { - if (subC2BF8(&_gameBoardSide[2]._arr1[i], Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) { - if (_gameBoardSide[2]._arr1[i]._cardId == 0) { - _gameBoardSide[2]._arr1[i]._cardId = _item6._cardId; - _gameBoardSide[2]._arr1[i]._card.postInit(); - _gameBoardSide[2]._arr1[i]._card.hide(); - _gameBoardSide[2]._arr1[i]._card.setVisage(1332); - _gameBoardSide[2]._arr1[i]._card.setPosition(_gameBoardSide[2]._arr1[i]._stationPos, 0); - _gameBoardSide[2]._arr1[i]._card.fixPriority(170); - setAnimationInfo(&_gameBoardSide[2]._arr1[i]); + if (subC2BF8(&_gameBoardSide[2]._handCard[i], Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) { + if (_gameBoardSide[2]._handCard[i]._cardId == 0) { + _gameBoardSide[2]._handCard[i]._cardId = _item6._cardId; + _gameBoardSide[2]._handCard[i]._card.postInit(); + _gameBoardSide[2]._handCard[i]._card.hide(); + _gameBoardSide[2]._handCard[i]._card.setVisage(1332); + _gameBoardSide[2]._handCard[i]._card.setPosition(_gameBoardSide[2]._handCard[i]._stationPos, 0); + _gameBoardSide[2]._handCard[i]._card.fixPriority(170); + setAnimationInfo(&_gameBoardSide[2]._handCard[i]); setCursorData(5, 1, 4); found = true; _field423E--; @@ -6625,29 +6625,29 @@ void Scene1337::subD02CA() { } else if (_item6._cardId == 25) { int k; if (subC2BF8(&_gameBoardSide[0]._arr4[0], Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) { - if ( (_gameBoardSide[0]._arr1[0]._cardId != 0) - || (_gameBoardSide[0]._arr1[1]._cardId != 0) - || (_gameBoardSide[0]._arr1[2]._cardId != 0) - || (_gameBoardSide[0]._arr1[3]._cardId != 0) ) { + if ( (_gameBoardSide[0]._handCard[0]._cardId != 0) + || (_gameBoardSide[0]._handCard[1]._cardId != 0) + || (_gameBoardSide[0]._handCard[2]._cardId != 0) + || (_gameBoardSide[0]._handCard[3]._cardId != 0) ) { for (k = 0; k <= 3; k++){ - if (_gameBoardSide[2]._arr1[k]._cardId == 0) + if (_gameBoardSide[2]._handCard[k]._cardId == 0) break; } - subC318B(2, &_gameBoardSide[2]._arr1[k], 0); + subC318B(2, &_gameBoardSide[2]._handCard[k], 0); return; } else { actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154); } } else if (subC2BF8(&_gameBoardSide[1]._arr4[0], Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) { - if ( (_gameBoardSide[1]._arr1[0]._cardId != 0) - || (_gameBoardSide[1]._arr1[1]._cardId != 0) - || (_gameBoardSide[1]._arr1[2]._cardId != 0) - || (_gameBoardSide[1]._arr1[3]._cardId != 0) ) { + if ( (_gameBoardSide[1]._handCard[0]._cardId != 0) + || (_gameBoardSide[1]._handCard[1]._cardId != 0) + || (_gameBoardSide[1]._handCard[2]._cardId != 0) + || (_gameBoardSide[1]._handCard[3]._cardId != 0) ) { for (k = 0; k <= 3; k++){ - if (_gameBoardSide[2]._arr1[k]._cardId == 0) + if (_gameBoardSide[2]._handCard[k]._cardId == 0) break; } - subC318B(2, &_gameBoardSide[2]._arr1[k], 1); + subC318B(2, &_gameBoardSide[2]._handCard[k], 1); return; } else { actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154); @@ -6655,15 +6655,15 @@ void Scene1337::subD02CA() { } if (subC2BF8(&_gameBoardSide[3]._arr4[0], Common::Point(_item6._stationPos.x + 12, _item6._stationPos.y + 12)) != 0) { - if ( (_gameBoardSide[3]._arr1[0]._cardId != 0) - || (_gameBoardSide[3]._arr1[1]._cardId != 0) - || (_gameBoardSide[3]._arr1[2]._cardId != 0) - || (_gameBoardSide[3]._arr1[3]._cardId != 0) ) { + if ( (_gameBoardSide[3]._handCard[0]._cardId != 0) + || (_gameBoardSide[3]._handCard[1]._cardId != 0) + || (_gameBoardSide[3]._handCard[2]._cardId != 0) + || (_gameBoardSide[3]._handCard[3]._cardId != 0) ) { for (k = 0; k <= 3; k++){ - if (_gameBoardSide[2]._arr1[k]._cardId == 0) + if (_gameBoardSide[2]._handCard[k]._cardId == 0) break; } - subC318B(2, &_gameBoardSide[2]._arr1[k], 3); + subC318B(2, &_gameBoardSide[2]._handCard[k], 3); return; } else { actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154); diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index 6db03b46c9..7c1a043577 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -196,7 +196,7 @@ class Scene1337 : public SceneExt { class unkObj1337_1: public SceneHotspot { public: - unkObj1337sub1 _arr1[4]; + unkObj1337sub1 _handCard[4]; unkObj1337sub1 _outpostStation[8]; unkObj1337sub1 _arr3[1]; unkObj1337sub1 _arr4[1]; |