diff options
Diffstat (limited to 'engines/startrek/rooms')
24 files changed, 123 insertions, 206 deletions
diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp index 9adb2eb307..e16e88427c 100644 --- a/engines/startrek/rooms/demon0.cpp +++ b/engines/startrek/rooms/demon0.cpp @@ -280,8 +280,7 @@ void Room::demon0TalkToMcCoy() { showText(TX_SPEAKER_SPOCK, TX_DEM0_029); if (!_vm->_awayMission.redshirtDead) showText(TX_SPEAKER_EVERTS, TX_DEM0_041); - } - else { + } else { showText(TX_SPEAKER_MCCOY, TX_DEM0_019); if (!_vm->_awayMission.demon.askedPrelateAboutSightings) { demon0AskPrelateAboutSightings(); diff --git a/engines/startrek/rooms/demon1.cpp b/engines/startrek/rooms/demon1.cpp index 3bd3e7caed..a30b5cc9ea 100644 --- a/engines/startrek/rooms/demon1.cpp +++ b/engines/startrek/rooms/demon1.cpp @@ -37,8 +37,7 @@ void Room::demon1Tick1() { _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_N; - } - else if (_vm->_awayMission.demon.enteredFrom == 2) { // Entered from north? + } else if (_vm->_awayMission.demon.enteredFrom == 2) { // Entered from north? _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S; @@ -48,8 +47,7 @@ void Room::demon1Tick1() { if (!_vm->_awayMission.demon.beatKlingons) { _vm->_awayMission.disableWalking = true; _vm->_awayMission.timers[2] = 50; - } - else { + } else { loadActorAnim(8, "klg1d2", 0x120, 0x82, 0); if (!_vm->_awayMission.demon.tookKlingonHand) loadActorAnim(13, "klghnd", 0x10b, 0x8e, 0); @@ -126,8 +124,7 @@ void Room::demon1Timer1Expired() { // TODO return; } - } - else if (_rdfData[0xcb] != 1) { + } else if (_rdfData[0xcb] != 1) { anim = "klg2f"; shooter = 9; switch (_roomVar.demon1.attackIndex) { @@ -147,8 +144,7 @@ void Room::demon1Timer1Expired() { // TODO return; } - } - else { + } else { anim = "klg3f"; shooter = 10; switch (_roomVar.demon1.attackIndex) { @@ -182,16 +178,13 @@ void Room::demon1KlingonFinishedAimingWeapon() { if (_roomVar.demon1.attackIndex == 1) { loadActorAnim2(OBJECT_REDSHIRT, "rstunn", -1, -1, 0); crewman = OBJECT_REDSHIRT; - } - else if (_roomVar.demon1.attackIndex == 2) { + } else if (_roomVar.demon1.attackIndex == 2) { loadActorAnim2(OBJECT_SPOCK, "sstunn", -1, -1, 0); crewman = OBJECT_SPOCK; - } - else if (_roomVar.demon1.attackIndex == 3) { + } else if (_roomVar.demon1.attackIndex == 3) { loadActorAnim2(OBJECT_MCCOY, "mstune", -1, -1, 0); crewman = OBJECT_MCCOY; - } - else if (_roomVar.demon1.attackIndex == 4) { + } else if (_roomVar.demon1.attackIndex == 4) { loadActorAnim2(OBJECT_KIRK, "kstunn", -1, -1, 1); crewman = OBJECT_KIRK; } @@ -221,8 +214,7 @@ void Room::demon1UsePhaserOnKlingon1() { if (_roomVar.demon1.kirkShooting) { demon1ShootKlingon1(); - } - else { + } else { loadActorAnim2(OBJECT_KIRK, "kfiren", -1, -1, 3); _roomVar.demon1.kirkShooting = true; } @@ -270,8 +262,7 @@ void Room::demon1UsePhaserOnKlingon2() { if (_roomVar.demon1.kirkShooting) { demon1ShootKlingon2(); - } - else { + } else { loadActorAnim2(OBJECT_KIRK, "kfiren", -1, -1, 4); _roomVar.demon1.kirkShooting = true; } @@ -300,8 +291,7 @@ void Room::demon1UsePhaserOnKlingon3() { if (_roomVar.demon1.kirkShooting) { demon1ShootKlingon3(); - } - else { + } else { loadActorAnim2(OBJECT_KIRK, "kfiren", -1, -1, 5); _roomVar.demon1.kirkShooting = true; } @@ -390,8 +380,7 @@ void Room::demon1UseSTricorderOnKlingon1() { if (_roomVar.demon1.numKlingonsKilled == 3 && !_vm->_awayMission.demon.tookKlingonHand && _rdfData[0xcf] != 1) { showText(TX_SPEAKER_SPOCK, TX_DEM1_018); _rdfData[0xcf] = 1; - } - else { + } else { showText(TX_SPEAKER_SPOCK, TX_DEM1_019); } } diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp index 689882d512..8584465070 100644 --- a/engines/startrek/rooms/demon3.cpp +++ b/engines/startrek/rooms/demon3.cpp @@ -45,8 +45,7 @@ void Room::demon3Tick1() { if (_vm->_awayMission.demon.doorOpened) { loadActorAnim(14, "door2", 0x82, 0x0c, 0); - } - else { + } else { loadMapFile("demon3a"); } @@ -91,8 +90,7 @@ void Room::demon3Timer3Expired() { loadMapFile("demon3"); _vm->_awayMission.demon.doorOpened = true; _vm->_awayMission.demon.missionScore += 2; - } - else { + } else { showText(TX_DEM3N007); } } @@ -237,8 +235,7 @@ void Room::demon3UsePhaserOnBoulder3() { _roomVar.demon3.boulderBeingShot = 3; strcpy(_roomVar.demon3.boulderAnim, "s0r3s1"); demon3BoulderCommon(); - } - else { + } else { showText(TX_SPEAKER_SPOCK, TX_DEM3_006); } } @@ -253,8 +250,7 @@ void Room::demon3UsePhaserOnBoulder4() { strcpy(_roomVar.demon3.boulderAnim, "s0r3s4"); _vm->_awayMission.demon.foundMiner = true; demon3BoulderCommon(); - } - else { + } else { // BUGFIX: In the original, the audio didn't play, despite the file existing (and // despite it being used for the boulder on the left). showText(TX_SPEAKER_SPOCK, TX_DEM3_006); @@ -271,8 +267,7 @@ void Room::demon3BoulderCommon() { if (_roomVar.demon3.inFiringPosition) { demon3PullOutPhaserAndFireAtBoulder(); - } - else { + } else { showText(TX_SPEAKER_KIRK, TX_DEM3_001); walkCrewman(OBJECT_KIRK, 0x79, 0xa0, 1); @@ -348,8 +343,7 @@ void Room::demon3RedshirtUsedPanel() { playSoundEffectIndex(0x06); _vm->_awayMission.redshirtDead = true; _vm->_awayMission.demon.field45 = true; - } - else { + } else { const int textTable[] = { TX_DEM3N005, TX_DEM3_033, @@ -404,8 +398,7 @@ void Room::demon3UseHandOnPanel() { if (_vm->_awayMission.demon.doorOpened) return; walkCrewman(OBJECT_KIRK, 0xd8, 0x70, 7); - } - else { + } else { showText(TX_SPEAKER_SPOCK, TX_DEM3_005); } } @@ -428,8 +421,7 @@ void Room::demon3UseMTricorderOnMiner() { if (_vm->_awayMission.demon.minerDead) { showText(TX_SPEAKER_MCCOY, TX_DEM3_022); - } - else { + } else { showText(TX_SPEAKER_MCCOY, TX_DEM3_023); } } @@ -437,8 +429,7 @@ void Room::demon3UseMTricorderOnMiner() { void Room::demon3UseMedkitOnMiner() { if (_vm->_awayMission.demon.healedMiner) { showText(TX_SPEAKER_MCCOY, TX_DEM3_015); - } - else { + } else { walkCrewman(OBJECT_MCCOY, 0xe6, 0x7b, 6); _roomVar.demon3.inFiringPosition = false; _roomVar.demon3.kirkPhaserOut = false; @@ -452,8 +443,7 @@ void Room::demon3McCoyReachedMiner() { void Room::demon3McCoyFinishedHealingMiner() { if (_vm->_awayMission.demon.minerDead) { showText(TX_SPEAKER_MCCOY, TX_DEM3_022); - } - else { + } else { showText(TX_SPEAKER_MCCOY, TX_DEM3_021); _vm->_awayMission.demon.healedMiner = true; loadActorAnim2(13, "drmine", 0xda, 0x6c, 0); @@ -485,8 +475,7 @@ void Room::demon3TalkToSpock() { void Room::demon3TalkToMccoy() { if (_vm->_awayMission.redshirtDead) { showText(TX_SPEAKER_MCCOY, TX_DEM3_014); - } - else { + } else { showText(TX_SPEAKER_MCCOY, TX_DEM3_025); showText(TX_SPEAKER_KIRK, TX_DEM3_003); showText(TX_SPEAKER_MCCOY, TX_DEM3_024); @@ -517,8 +506,7 @@ void Room::demon3LookAtRedshirt() { if (_vm->_awayMission.redshirtDead) { showText(TX_DEM3N017); // NOTE: there's an alternate string that isn't used? (TX_DEM3N018) - } - else { + } else { showText(TX_DEM3N003); } } @@ -530,8 +518,7 @@ void Room::demon3LookAnywhere() { void Room::demon3LookAtMiner() { if (_vm->_awayMission.demon.healedMiner) { showText(TX_DEM3N000); - } - else { + } else { showText(TX_DEM3N006); } } @@ -559,8 +546,7 @@ void Room::demon3LookAtStructure() { void Room::demon3LookAtDoor() { if (_vm->_awayMission.demon.doorOpened) { showText(TX_DEM3N014); - } - else { + } else { showText(TX_DEM3N012); } } diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp index b42eb80f28..d70c5fb1be 100644 --- a/engines/startrek/rooms/demon4.cpp +++ b/engines/startrek/rooms/demon4.cpp @@ -140,8 +140,7 @@ void Room::demon4UsePhaserOnNauian() { if (!_roomVar.demon4.triedToShootNauian) { // Lenient the first time showText(TX_SPEAKER_NAUIAN, TX_DEM4_033); _roomVar.demon4.triedToShootNauian = true; - } - else { // Murdery the second time + } else { // Murdery the second time showText(TX_SPEAKER_NAUIAN, TX_DEM4_032); loadActorAnim2(10, "bxfire", 0, 0, 2); playVoc("V0SPOCKT"); @@ -279,12 +278,10 @@ void Room::demon4TalkToNauian() { _vm->_awayMission.disableInput = true; _vm->_awayMission.demon.missionScore += 5; _vm->_awayMission.timers[1] = 20; - } - else { + } else { showText(TX_SPEAKER_NAUIAN, TX_DEM4_038); } - } - else { + } else { showText(TX_SPEAKER_NAUIAN, TX_DEM4_031); } } @@ -367,8 +364,7 @@ void Room::demon4CrewmanReachedPanel() { loadActorAnim(9, "ctrl", 0, 0, 0); _vm->_awayMission.demon.missionScore += 3; _vm->_awayMission.timers[0] = 10; - } - else + } else showText(TX_DEM4N013); walkCrewman(_roomVar.demon4.crewmanUsingPanel, 0xae, 0x93, 0); diff --git a/engines/startrek/rooms/demon5.cpp b/engines/startrek/rooms/demon5.cpp index 010b90c666..7227dd0cc1 100644 --- a/engines/startrek/rooms/demon5.cpp +++ b/engines/startrek/rooms/demon5.cpp @@ -158,8 +158,7 @@ void Room::demon5TalkToRoberts() { _roomVar.demon5.numTalkedTo++; demon5CheckCompletedStudy(); } - } - else { + } else { showText(TX_DEM5N010); } } @@ -177,8 +176,7 @@ void Room::demon5TalkToChub() { _roomVar.demon5.numTalkedTo++; demon5CheckCompletedStudy(); } - } - else { + } else { showText(TX_DEM5N013); } } @@ -195,8 +193,7 @@ void Room::demon5TalkToGrisnash() { _roomVar.demon5.numTalkedTo++; demon5CheckCompletedStudy(); } - } - else { + } else { showText(TX_DEM5N011); } } @@ -214,21 +211,16 @@ void Room::demon5TalkToStephen() { _roomVar.demon5.numTalkedTo++; demon5CheckCompletedStudy(); } - } - else if (!_vm->_awayMission.demon.knowAboutHypoDytoxin) { + } else if (!_vm->_awayMission.demon.knowAboutHypoDytoxin) { showText(TX_SPEAKER_ROBERTS, TX_DEM5_034); - } - else if (_vm->_awayMission.demon.madeHypoDytoxin) { + } else if (_vm->_awayMission.demon.madeHypoDytoxin) { showText(TX_SPEAKER_ROBERTS, TX_DEM5_035); - } - else if (_vm->_awayMission.demon.gotBerries) { + } else if (_vm->_awayMission.demon.gotBerries) { showText(TX_SPEAKER_ROBERTS, TX_DEM5_032); _vm->_awayMission.demon.field3e = false; - } - else if (_vm->_awayMission.demon.field3e) { + } else if (_vm->_awayMission.demon.field3e) { showText(TX_SPEAKER_ROBERTS, TX_DEM5_038); - } - else { + } else { showText(TX_SPEAKER_ROBERTS, TX_DEM5_034); } } @@ -258,8 +250,7 @@ void Room::demon5TalkToMccoy() { showText(TX_SPEAKER_SPOCK, TX_DEM5_026); showText(TX_SPEAKER_MCCOY, TX_DEM5_019); } - } - else { + } else { showText(TX_SPEAKER_MCCOY, TX_DEM5_017); } } @@ -287,8 +278,7 @@ void Room::demon5UseMTricorderOnChub() { _roomVar.demon5.scannedChub = true; _roomVar.demon5.numScanned++; demon5CheckCompletedStudy(); - } - else { + } else { if (_vm->_awayMission.demon.field3e) showText(TX_SPEAKER_MCCOY, TX_DEM5_010); else { diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp index ca0c1a008f..a4cd58e5aa 100644 --- a/engines/startrek/rooms/demon6.cpp +++ b/engines/startrek/rooms/demon6.cpp @@ -174,8 +174,7 @@ void Room::demon6TalkToStephen() { void Room::demon6UseBerryOnStephen() { if (_vm->_awayMission.demon.knowAboutHypoDytoxin) { showText(TX_SPEAKER_STEPHEN, TX_DEM6_027); - } - else { + } else { showText(TX_SPEAKER_STEPHEN, TX_DEM6_026); } } @@ -209,8 +208,7 @@ void Room::demon6FinishedMakingHypoDytoxin() { void Room::demon6UseHandOnWorkspace() { if (_vm->_awayMission.demon.repairedHand) { showText(TX_SPEAKER_SPOCK, TX_DEM6N018); // FIXME - } - else { + } else { _vm->_awayMission.disableInput = true; showText(TX_SPEAKER_KIRK, TX_DEM6_005); walkCrewman(OBJECT_SPOCK, 0xb3, 0xbb, 2); @@ -247,8 +245,7 @@ insult: showText(TX_SPEAKER_STEPHEN, TX_DEM6_030); _roomVar.demon6.insultedStephenRecently = true; _vm->_awayMission.demon.insultedStephen = true; - } - else if (choice == 1) { + } else if (choice == 1) { showText(TX_SPEAKER_STEPHEN, TX_DEM6_034); explain: while (true) { @@ -280,8 +277,7 @@ explain: goto error; } } - } - else if (choice == 2) { + } else if (choice == 2) { showText(TX_SPEAKER_STEPHEN, TX_DEM6_031); int choices3[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_BLANK}; choice = showText(choices3); @@ -292,13 +288,11 @@ explain: goto explain; else goto error; - } - else { + } else { error: showText(TX_DIALOG_ERROR); } - } - else { + } else { showText(TX_DEM6N012); showText(TX_SPEAKER_MCCOY, TX_DEM6_019); } diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp index c5f7307c74..667608a7ff 100644 --- a/engines/startrek/rooms/feather1.cpp +++ b/engines/startrek/rooms/feather1.cpp @@ -475,10 +475,10 @@ void Room::feather1CrewmanClimbVine() { _vm->_awayMission.disableInput = true; if (_roomVar.feather.crewEscaped[_roomVar.feather.crewmanClimbingVine]) walkCrewmanC(_roomVar.feather.crewmanClimbingVine, VINE_TOP_X, VINE_TOP_Y, - &Room::feather1ReachedVineToClimbDown); + &Room::feather1ReachedVineToClimbDown); else walkCrewmanC(_roomVar.feather.crewmanClimbingVine, VINE_BOT_X, VINE_BOT_Y, - &Room::feather1ReachedVineToClimbUp); + &Room::feather1ReachedVineToClimbUp); } void Room::feather1ReachedVineToClimbUp() { diff --git a/engines/startrek/rooms/feather3.cpp b/engines/startrek/rooms/feather3.cpp index fd87c81d2f..ebdf48abf7 100644 --- a/engines/startrek/rooms/feather3.cpp +++ b/engines/startrek/rooms/feather3.cpp @@ -68,9 +68,9 @@ extern const RoomAction feather3ActionList[] = { { {ACTION_TALK, OBJECT_REDSHIRT, 0, 0}, &Room::feather3TalkToRedshirt }, { {ACTION_TALK, OBJECT_TLAOXAC, 0, 0}, &Room::feather3TalkToTlaoxac }, { {ACTION_FINISHED_ANIMATION, 2, 0, 0}, &Room::feather3TlaoxacKilledRedshirt }, - { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_TLAOXAC, 0},&Room::feather3UseMTricorderOnTlaoxac }, + { {ACTION_USE, OBJECT_IMTRICOR, OBJECT_TLAOXAC, 0}, &Room::feather3UseMTricorderOnTlaoxac }, { {ACTION_USE, OBJECT_IMEDKIT, OBJECT_TLAOXAC, 0}, &Room::feather3UseMedkitOnTlaoxac }, - { {ACTION_USE, OBJECT_IMEDKIT, OBJECT_REDSHIRT, 0},&Room::feather3UseMedkitOnRedshirt }, + { {ACTION_USE, OBJECT_IMEDKIT, OBJECT_REDSHIRT, 0}, &Room::feather3UseMedkitOnRedshirt }, { {ACTION_USE, OBJECT_IMEDKIT, 0xff, 0}, &Room::feather3UseMedkitAnywhere }, { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_LIGHT_1, 0}, &Room::feather3UseMTricorderOnLight }, { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_LIGHT_2, 0}, &Room::feather3UseMTricorderOnLight }, diff --git a/engines/startrek/rooms/feather4.cpp b/engines/startrek/rooms/feather4.cpp index 69d3f37842..2c18155403 100644 --- a/engines/startrek/rooms/feather4.cpp +++ b/engines/startrek/rooms/feather4.cpp @@ -39,13 +39,13 @@ extern const RoomAction feather4ActionList[] = { { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_LIGHT_1, 0}, &Room::feather4UseSTricorderOnLight }, { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_LIGHT_2, 0}, &Room::feather4UseSTricorderOnLight }, { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_LIGHT_3, 0}, &Room::feather4UseSTricorderOnLight }, - { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_MUSHROOM, 0},&Room::feather4UseSTricorderOnMushroom }, + { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_MUSHROOM, 0}, &Room::feather4UseSTricorderOnMushroom }, { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_FERN, 0}, &Room::feather4UseSTricorderOnFern }, { {ACTION_USE, OBJECT_ISTRICOR, 0xff, 0}, &Room::feather4UseSTricorderAnywhere }, { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_LIGHT_1, 0}, &Room::feather4UseMTricorderOnLight }, { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_LIGHT_2, 0}, &Room::feather4UseMTricorderOnLight }, { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_LIGHT_3, 0}, &Room::feather4UseMTricorderOnLight }, - { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_MUSHROOM, 0},&Room::feather4UseMTricorderOnMushroom }, + { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_MUSHROOM, 0}, &Room::feather4UseMTricorderOnMushroom }, { {ACTION_USE, OBJECT_IMTRICOR, 0xff, 0}, &Room::feather4UseMTricorderAnywhere }, { {ACTION_USE, OBJECT_IMEDKIT, 0xff, 0}, &Room::feather4UseMedkitAnywhere }, { {ACTION_TALK, OBJECT_MCCOY, 0, 0}, &Room::feather4TalkToMccoy }, diff --git a/engines/startrek/rooms/feather5.cpp b/engines/startrek/rooms/feather5.cpp index 843604d65c..a8ca002aa2 100644 --- a/engines/startrek/rooms/feather5.cpp +++ b/engines/startrek/rooms/feather5.cpp @@ -81,7 +81,7 @@ extern const RoomAction feather5ActionList[] = { { {ACTION_USE, OBJECT_IROCK, OBJECT_REDSHIRT, 0}, &Room::feather5UseRockOnRedshirt }, { {ACTION_USE, OBJECT_SPOCK, OBJECT_THROWN_FERN, 0}, &Room::feather5UseCrewmanOnThrownFern }, { {ACTION_USE, OBJECT_MCCOY, OBJECT_THROWN_FERN, 0}, &Room::feather5UseCrewmanOnThrownFern }, - { {ACTION_USE, OBJECT_REDSHIRT, OBJECT_THROWN_FERN, 0},&Room::feather5UseCrewmanOnThrownFern }, + { {ACTION_USE, OBJECT_REDSHIRT, OBJECT_THROWN_FERN, 0}, &Room::feather5UseCrewmanOnThrownFern }, { {ACTION_USE, OBJECT_SPOCK, OBJECT_MONSTER, 0}, &Room::feather5UseSpockOnMonster }, { {ACTION_USE, OBJECT_MCCOY, OBJECT_MONSTER, 0}, &Room::feather5UseMccoyOnMonster }, { {ACTION_USE, OBJECT_REDSHIRT, OBJECT_MONSTER, 0}, &Room::feather5UseRedshirtOnMonster }, diff --git a/engines/startrek/rooms/feather6.cpp b/engines/startrek/rooms/feather6.cpp index 5b86a146b8..204d349459 100644 --- a/engines/startrek/rooms/feather6.cpp +++ b/engines/startrek/rooms/feather6.cpp @@ -55,7 +55,7 @@ extern const RoomAction feather6ActionList[] = { { {ACTION_USE, OBJECT_IROCK, HOTSPOT_STALAGMITES, 0}, &Room::feather6UseRockOnStalagmites }, { {ACTION_USE, OBJECT_IROCK, HOTSPOT_EAST_EXIT, 0}, &Room::feather6UseRockOnStalagmites }, { {ACTION_USE, OBJECT_IROCK, 0xff, 0}, &Room::feather6UseRockAnywhere }, - { {ACTION_USE, OBJECT_IKNIFE, HOTSPOT_STALAGMITES, 0},&Room::feather6UseKnifeOnStalagmites }, + { {ACTION_USE, OBJECT_IKNIFE, HOTSPOT_STALAGMITES, 0}, &Room::feather6UseKnifeOnStalagmites }, { {ACTION_USE, OBJECT_IKNIFE, 0xff, 0}, &Room::feather6UseKnifeAnywhere }, { {ACTION_USE, OBJECT_IKNIFE, OBJECT_MCCOY, 0}, &Room::feather6UseKnifeOnMccoy }, { {ACTION_USE, OBJECT_IKNIFE, OBJECT_SPOCK, 0}, &Room::feather6UseKnifeOnSpock }, @@ -78,14 +78,14 @@ extern const RoomAction feather6ActionList[] = { { {ACTION_TALK, OBJECT_MCCOY, 0, 0}, &Room::feather6TalkToMccoy }, { {ACTION_TALK, OBJECT_REDSHIRT, 0, 0}, &Room::feather6TalkToRedshirt }, { {ACTION_TALK, OBJECT_SPOCK, 0, 0}, &Room::feather6TalkToSpock }, - { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_EAST_EXIT, 0},&Room::feather6UseMTricorderOnEastExit }, + { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_EAST_EXIT, 0}, &Room::feather6UseMTricorderOnEastExit }, { {ACTION_USE, OBJECT_IMTRICOR, HOTSPOT_ROCKS, 0}, &Room::feather6UseMTricorderOnRocks }, - { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_EAST_EXIT, 0},&Room::feather6UseSTricorderOnEastExit }, + { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_EAST_EXIT, 0}, &Room::feather6UseSTricorderOnEastExit }, { {ACTION_USE, OBJECT_ISTRICOR, 0xff, 0}, &Room::feather6UseSTricorderAnywhere }, { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_ROCKS, 0}, &Room::feather6UseSTricorderOnRocks }, { {ACTION_USE, OBJECT_ISTRICOR, OBJECT_CRYSTALS, 0}, &Room::feather6UseSTricorderOnCrystals }, - { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_STALACTITES, 0},&Room::feather6UseSTricorderOnStalactites }, - { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_STALAGMITES, 0},&Room::feather6UseSTricorderOnStalagmites }, + { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_STALACTITES, 0}, &Room::feather6UseSTricorderOnStalactites }, + { {ACTION_USE, OBJECT_ISTRICOR, HOTSPOT_STALAGMITES, 0}, &Room::feather6UseSTricorderOnStalagmites }, { {ACTION_GET, OBJECT_CRYSTALS, 0, 0}, &Room::feather6GetCrystals }, { {ACTION_USE, OBJECT_IKNIFE, OBJECT_CRYSTALS, 0}, &Room::feather6UseKnifeOnCrystals }, diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp index 23a6e2a242..612cd8cd8c 100644 --- a/engines/startrek/rooms/love1.cpp +++ b/engines/startrek/rooms/love1.cpp @@ -77,7 +77,7 @@ void Room::love1Tick1() { common: loadActorAnim(OBJECT_BOTTLE, _roomVar.love.bottleAnimation, 0xa3, 0x72, 0); - // fall through + // fall through case BOTTLETYPE_NONE: break; @@ -308,8 +308,8 @@ void Room::love1KirkGotCureSample() { giveItem(OBJECT_ISAMPLE); showText(TX_LOV1N035); - // BUGFIX: after removing the cure, unset this variable. - // Otherwise, any normal dish inserted afterward automagically becomes a cure. + // BUGFIX: after removing the cure, unset this variable. + // Otherwise, any normal dish inserted afterward automagically becomes a cure. _vm->_awayMission.love.chamberHasCure = false; } else { giveItem(OBJECT_IDISHES); diff --git a/engines/startrek/rooms/love3.cpp b/engines/startrek/rooms/love3.cpp index f7d4af4eef..03ae5840b7 100644 --- a/engines/startrek/rooms/love3.cpp +++ b/engines/startrek/rooms/love3.cpp @@ -225,8 +225,7 @@ void Room::love3OpenedOrClosedServicePanel() { showText(TX_LOV3N023); else showText(TX_LOV3N022); - } - else + } else showText(TX_LOV3N020); } @@ -246,8 +245,7 @@ void Room::love3ScrewedOrUnscrewedGasTank() { if (!_vm->_awayMission.redshirtDead) showText(TX_SPEAKER_FERRIS, TX_LOV3_022); _vm->_awayMission.love.gasTankUnscrewed = true; - } - else { + } else { showText(TX_LOV3N015); _vm->_awayMission.love.gasTankUnscrewed = false; } @@ -351,8 +349,7 @@ void Room::love3OpenedOrClosedGrate() { _vm->_awayMission.love.gotPointsForOpeningGrate = true; _vm->_awayMission.love.missionScore++; } - } - else { + } else { loadActorAnim(OBJECT_GRATE, "s3r4g1", 0x116, 0x8f, 0); _vm->_awayMission.love.grateRemoved = false; showText(TX_LOV3N032); @@ -452,8 +449,7 @@ void Room::love3PouredRomulanLaughingGasDownShaft() { if (_vm->_awayMission.love.romulansUnconsciousFromVirus) { showText(TX_LOV3NA08); _vm->_awayMission.love.romulansUnconsciousFromLaughingGas = false; - } - else { + } else { showText(TX_LOV3NA09); playVoc("ROMULANL"); } @@ -500,8 +496,7 @@ void Room::love3ReachedGasTankUsingAntigrav() { if (_vm->_awayMission.love.gasTankUnscrewed) { loadActorAnimC(OBJECT_KIRK, "kusehe", -1, -1, &Room::love3PickedUpGasTank); playVoc("SE3PLBAT"); - } - else { + } else { showText(TX_LOV3N010); showText(TX_SPEAKER_SPOCK, TX_LOV3_015); } diff --git a/engines/startrek/rooms/love4.cpp b/engines/startrek/rooms/love4.cpp index cc05f72b5d..447f763928 100644 --- a/engines/startrek/rooms/love4.cpp +++ b/engines/startrek/rooms/love4.cpp @@ -41,8 +41,7 @@ void Room::love4Tick1() { loadActorAnim2(OBJECT_ROMULAN_2, "s3r5r2b", 0xb9, 0xbb, 0); loadActorAnim2(OBJECT_ROMULAN_3, "s3r5r3b", 0xef, 0xc4, 0); loadActorAnim2(OBJECT_ROMULAN_4, "s3r5r4b", 0x12a, 0xaa, 0); - } - else { + } else { loadActorAnim2(OBJECT_ROMULAN_1, "s3r5r1a", 0x36, 0xb3, 0); loadActorAnim2(OBJECT_ROMULAN_2, "s3r5r2a", 0xb9, 0xbb, 0); loadActorAnim2(OBJECT_ROMULAN_3, "s3r5r3a", 0xef, 0xc4, 0); diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp index 4bb9cb6dad..fdad4a3a8b 100644 --- a/engines/startrek/rooms/love5.cpp +++ b/engines/startrek/rooms/love5.cpp @@ -40,8 +40,7 @@ void Room::love5Tick1() { if (_vm->_awayMission.love.freedMarcusAndCheever) { loadActorAnim(OBJECT_MARCUS, "marcusst", 0x28, 0xa6); loadActorAnim(OBJECT_CHEEVER, "s3gtupst", 0x49, 0xac); - } - else { + } else { loadActorAnim(OBJECT_MARCUS, "marcus2", 0x28, 0xa6); loadActorAnim(OBJECT_CHEEVER, "s3gtup2", 0x49, 0xac); } @@ -172,7 +171,7 @@ void Room::love5TalkToPreax() { switch (choice) { case 1: showText(TX_SPEAKER_MARCUS, TX_LOV5_043); - // fall through + // fall through case 0: showText(TX_SPEAKER_PREAX, TX_LOV5_061); showText(TX_SPEAKER_KIRK, TX_LOV5_010); @@ -199,8 +198,7 @@ void Room::love5TalkToPreax() { if (!_vm->_awayMission.love.spockCured) { showText(TX_SPEAKER_MCCOY, TX_LOV5_021); walkCrewmanC(OBJECT_MCCOY, 0x87, 0xc3, &Room::love5MccoyReachedSpockToCure); - } - else + } else love5EndMission(); } } else @@ -326,14 +324,12 @@ void Room::love5UseWaterOnPreax() { _vm->_awayMission.love.missionScore++; } loseItem(OBJECT_IH2O); - } - else { + } else { if (_vm->_awayMission.love.romulansUnconsciousFromVirus) { showText(TX_SPEAKER_MCCOY, TX_LOV5_013); // BUGFIX: original didn't have correct speaker. Also, you shouldn't lose your // water since it's not actually used here, so a "loseItem" line was removed. - } - else { + } else { showText(TX_LOV5N017); if (!_vm->_awayMission.redshirtDead) { showText(TX_SPEAKER_FERRIS, TX_LOV5_053); diff --git a/engines/startrek/rooms/lovea.cpp b/engines/startrek/rooms/lovea.cpp index 9805123394..e4e9f1c158 100644 --- a/engines/startrek/rooms/lovea.cpp +++ b/engines/startrek/rooms/lovea.cpp @@ -67,8 +67,7 @@ void Room::loveaTimer0Expired() { if (randomVal == 0 || _vm->_awayMission.redshirtDead) { speaker = TX_SPEAKER_MCCOY; textTable = mccoyText; - } - else { + } else { speaker = TX_SPEAKER_FERRIS; textTable = ferrisText; } @@ -122,8 +121,7 @@ void Room::loveaUseCureSampleOnSpock() { if (_vm->_awayMission.love.spockCured) { walkCrewman(OBJECT_SPOCK, _roomVar.love.cmnXPosToCureSpock, _roomVar.love.cmnYPosToCureSpock, 99); walkCrewman(OBJECT_MCCOY, _roomVar.love.cmnXPosToCureSpock, _roomVar.love.cmnYPosToCureSpock + 10, 99); - } - else + } else showText(TX_SPEAKER_MCCOY, TX_LOVA_F55); } @@ -162,20 +160,16 @@ void Room::loveaTimer2Expired() { playMidiMusicTracks(2, -1); // FIXME: assembly had no second parameter...? showText(TX_GENER004); showGameOverMenu(); - } - else if (_vm->_awayMission.love.spockInfectionCounter == 15) { + } else if (_vm->_awayMission.love.spockInfectionCounter == 15) { showText(TX_SPEAKER_SPOCK, TX_SPOKCOFF); _vm->_awayMission.love.spockInfectionCounter++; - } - else if (_vm->_awayMission.love.spockInfectionCounter == 30) { + } else if (_vm->_awayMission.love.spockInfectionCounter == 30) { showText(TX_SPEAKER_MCCOY, TX_LOVA_F08); _vm->_awayMission.love.spockInfectionCounter++; - } - else if (_vm->_awayMission.love.spockInfectionCounter == 45) { + } else if (_vm->_awayMission.love.spockInfectionCounter == 45) { showText(TX_SPEAKER_SPOCK, TX_SPOKCOFF); _vm->_awayMission.love.spockInfectionCounter++; - } - else if (_vm->_awayMission.love.spockInfectionCounter == 60) { + } else if (_vm->_awayMission.love.spockInfectionCounter == 60) { showText(TX_SPEAKER_SPOCK, TX_LOVA_F54); _vm->_awayMission.love.romulansUnconsciousFromVirus = true; _vm->_awayMission.love.spockInfectionCounter++; diff --git a/engines/startrek/rooms/mudd0.cpp b/engines/startrek/rooms/mudd0.cpp index 9105c01e25..0b450e08fb 100644 --- a/engines/startrek/rooms/mudd0.cpp +++ b/engines/startrek/rooms/mudd0.cpp @@ -42,10 +42,10 @@ namespace StarTrek { void Room::mudd0Tick1() { playVoc("MUD0LOOP"); - // NOTE: Using the floppy version's code here; Mudd disappears from this room after - // the first meeting. Fixes an issue where Mudd appears in the first room when he's - // supposed to be in the medbay. - // TODO: verify this matches with floppy version's code + // NOTE: Using the floppy version's code here; Mudd disappears from this room after + // the first meeting. Fixes an issue where Mudd appears in the first room when he's + // supposed to be in the medbay. + // TODO: verify this matches with floppy version's code if (_vm->_awayMission.mudd.muddFirstRoomState != 0) _vm->_awayMission.mudd.muddFirstRoomState = 2; else { @@ -292,8 +292,7 @@ void Room::mudd0TalkToRedshirt() { if (_vm->_awayMission.mudd.muddFirstRoomState == 2) { showText(TX_SPEAKER_BUCHERT, TX_MUD0_039); showText(TX_SPEAKER_KIRK, TX_MUD0_008); - } - else { + } else { showText(TX_SPEAKER_BUCHERT, TX_MUD0_040); showText(TX_SPEAKER_MUDD, TX_MUD0_030); showText(TX_SPEAKER_BUCHERT, TX_MUD0_041); diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp index a2baf71eb6..d741478f6d 100644 --- a/engines/startrek/rooms/mudd1.cpp +++ b/engines/startrek/rooms/mudd1.cpp @@ -174,7 +174,7 @@ void Room::mudd1SpockPressedRedButton() { case 1: showText(TX_SPEAKER_KIRK, TX_MUD1_007); - // fall through + // fall through case 2: _vm->_awayMission.mudd.torpedoStatus = 1; diff --git a/engines/startrek/rooms/mudd2.cpp b/engines/startrek/rooms/mudd2.cpp index 3a3ba81d14..ef1ec6afb5 100644 --- a/engines/startrek/rooms/mudd2.cpp +++ b/engines/startrek/rooms/mudd2.cpp @@ -301,8 +301,7 @@ void Room::mudd2UseMedkitOnMudd() { showText(TX_SPEAKER_MCCOY, TX_MUD2_021); else walkCrewmanC(OBJECT_MCCOY, 0xde, 0xaf, &Room::mudd2MccoyReachedMudd); - } - else // Can't get to him since he's busy being crazy + } else // Can't get to him since he's busy being crazy showText(TX_SPEAKER_MCCOY, TX_MUD2_016); } diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp index 2905fb3e0a..90bdf1dcee 100644 --- a/engines/startrek/rooms/mudd4.cpp +++ b/engines/startrek/rooms/mudd4.cpp @@ -190,8 +190,7 @@ void Room::mudd4UseKirkOnConsole() { _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N; walkCrewmanC(OBJECT_SPOCK, 0x6d, 0x9a, &Room::mudd4FinishedWalking3); _vm->_awayMission.disableInput = true; - } - else { + } else { if (!_roomVar.mudd.kirkUsingRightConsole) showText(TX_SPEAKER_KIRK, TX_MUD4_049); _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; @@ -257,8 +256,7 @@ void Room::mudd4KirkUsedViewScreen() { _vm->_awayMission.mudd.gotPointsForEnablingViewscreen = true; _vm->_awayMission.mudd.missionScore++; } - } - else { + } else { _vm->_awayMission.mudd.viewScreenEnabled = false; loadActorAnim(OBJECT_VIEWSCREEN, "s4crvf", 0xa5, 0x76); _vm->_awayMission.timers[3] = 5; @@ -356,9 +354,9 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { _vm->_awayMission.disableInput = false; if (_vm->_awayMission.mudd.discoveredLenseAndDegrimerFunction - || _vm->_awayMission.mudd.muddErasedDatabase - || _vm->_awayMission.mudd.databaseDestroyed - || !_vm->_awayMission.mudd.accessedAlienDatabase) { // NOTE: why this last line? Test this... + || _vm->_awayMission.mudd.muddErasedDatabase + || _vm->_awayMission.mudd.databaseDestroyed + || !_vm->_awayMission.mudd.accessedAlienDatabase) { // NOTE: why this last line? Test this... const int choices[] = { TX_SPEAKER_KIRK, TX_MUD4_009, @@ -399,8 +397,7 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { showText(TX_SPEAKER_KIRK, TX_MUD4_036); showText(TX_SPEAKER_SPOCK, TX_MUD4_029); showText(TX_SPEAKER_KIRK, TX_MUD4_030); - } - else { + } else { // Mudd is forced to agree to give samples to a university. showText(TX_SPEAKER_MUDD, TX_MUD4_064); showText(TX_SPEAKER_KIRK, TX_MUD4_012); @@ -420,8 +417,7 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() { endMission(_vm->_awayMission.mudd.missionScore, 0x1b, _vm->_awayMission.mudd.torpedoStatus); } - } - else { + } else { const int choices[] = { TX_SPEAKER_KIRK, TX_MUD4_014, diff --git a/engines/startrek/rooms/mudda.cpp b/engines/startrek/rooms/mudda.cpp index 03f71f9974..78c562958f 100644 --- a/engines/startrek/rooms/mudda.cpp +++ b/engines/startrek/rooms/mudda.cpp @@ -119,12 +119,12 @@ void Room::muddaTick() { /* // Unused: The positions to they originally walked to before collapsing. const Common::Point deathPositions[][4] = { - { Common::Point(0xbb, 0x8d), Common::Point(0xd0, 0x89), Common::Point(0xaa, 0x85), Common::Point(0xbf, 0x83) }, - { Common::Point(0xaa, 0xa5), Common::Point(0x83, 0xac), Common::Point(-1, -1), Common::Point(-1, -1) }, - { Common::Point(0x108, 0xbb), Common::Point(0x118, 0xc4), Common::Point(0xfe, 0xb2), Common::Point(0x117, 0xae) }, - { Common::Point(0xf1, 0x95), Common::Point(0xcd, 0x87), Common::Point(0xec, 0x84), Common::Point(0x110, 0xa6) }, - { Common::Point(0x8b, 0xb6), Common::Point(0x69, 0xb7), Common::Point(-1, -1), Common::Point(-1, -1) }, - { Common::Point(0x8b, 0xac), Common::Point(0x6f, 0x99), Common::Point(-1, -1), Common::Point(-1, -1) }, + { Common::Point(0xbb, 0x8d), Common::Point(0xd0, 0x89), Common::Point(0xaa, 0x85), Common::Point(0xbf, 0x83) }, + { Common::Point(0xaa, 0xa5), Common::Point(0x83, 0xac), Common::Point(-1, -1), Common::Point(-1, -1) }, + { Common::Point(0x108, 0xbb), Common::Point(0x118, 0xc4), Common::Point(0xfe, 0xb2), Common::Point(0x117, 0xae) }, + { Common::Point(0xf1, 0x95), Common::Point(0xcd, 0x87), Common::Point(0xec, 0x84), Common::Point(0x110, 0xa6) }, + { Common::Point(0x8b, 0xb6), Common::Point(0x69, 0xb7), Common::Point(-1, -1), Common::Point(-1, -1) }, + { Common::Point(0x8b, 0xac), Common::Point(0x6f, 0x99), Common::Point(-1, -1), Common::Point(-1, -1) }, }; */ diff --git a/engines/startrek/rooms/trial5.cpp b/engines/startrek/rooms/trial5.cpp index a71d413545..ecc3c64c2e 100644 --- a/engines/startrek/rooms/trial5.cpp +++ b/engines/startrek/rooms/trial5.cpp @@ -461,7 +461,7 @@ void Room::trial5ReachedHoleToPutGem() { Common::Point(0x22, 0x95), Common::Point(0x3c, 0x95), }; - const char * const gemAnims[] = { + const char *const gemAnims[] = { "RedGem1", "RedGem2", "RedGem3", "GrnGem1", "GrnGem2", "GrnGem3", "BluGem1", "BluGem2", "BluGem3", diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp index 8c24a36ac4..e3229c156c 100644 --- a/engines/startrek/rooms/tug2.cpp +++ b/engines/startrek/rooms/tug2.cpp @@ -139,8 +139,7 @@ void Room::tug2GetBomb() { _vm->_awayMission.disableInput = true; _vm->_awayMission.crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N; walkCrewman(OBJECT_KIRK, 0xc9, 0xa0, 12); - } - else + } else showText(TX_TUG2N024); } @@ -297,8 +296,7 @@ void Room::tug2KirkGotWires() { _vm->_awayMission.tug.gotWires = true; _vm->_awayMission.disableInput = false; _vm->_awayMission.tug.missionScore += 3; - } - else { + } else { loadActorStandAnim(OBJECT_WIRE); giveItem(OBJECT_IWIRING); _vm->_awayMission.tug.gotWires = true; @@ -368,8 +366,7 @@ void Room::tug2TurnedOffForceField() { loadActorAnim2(OBJECT_BOMB, "t2bbo", -3, 1, 0); // FIXME: doesn't play "PHASSHOT" sound effect like when kirk removes wires? _vm->_awayMission.tug.field35 = 6; - } - else if (_vm->_awayMission.tug.field35 == 4 && !_vm->_awayMission.tug.brigForceFieldDown) { + } else if (_vm->_awayMission.tug.field35 == 4 && !_vm->_awayMission.tug.brigForceFieldDown) { _vm->_awayMission.tug.brigForceFieldDown = true; loadActorAnim2(OBJECT_BRIG, "fld10", 0, 0, 2); _vm->_awayMission.tug.missionScore += 6; @@ -459,7 +456,7 @@ void Room::tug2UseStunPhaserOnGuard2() { } void Room::tug2KirkShootGuard2() { - if (_vm->_awayMission.tug.guard2Status == GUARDSTAT_UP){ + if (_vm->_awayMission.tug.guard2Status == GUARDSTAT_UP) { loadActorAnim2(OBJECT_GUARD_2, "p6stun", -1, -1, 0); _vm->_awayMission.tug.guard2Status = GUARDSTAT_STUNNED; playSoundEffectIndex(SND_PHASSHOT); @@ -487,7 +484,7 @@ void Room::tug2UseKillPhaserOnGuard1() { } void Room::tug2KirkKillGuard1() { - if (_vm->_awayMission.tug.guard1Status == GUARDSTAT_UP){ + if (_vm->_awayMission.tug.guard1Status == GUARDSTAT_UP) { loadActorAnim2(OBJECT_GUARD_1, "p5kill", -1, -1, 0); _vm->_awayMission.tug.guard1Status = GUARDSTAT_DEAD; playSoundEffectIndex(SND_PHASSHOT); @@ -515,7 +512,7 @@ void Room::tug2UseKillPhaserOnGuard2() { } void Room::tug2KirkKillGuard2() { - if (_vm->_awayMission.tug.guard2Status == GUARDSTAT_UP){ + if (_vm->_awayMission.tug.guard2Status == GUARDSTAT_UP) { loadActorAnim2(OBJECT_GUARD_2, "p6kill", -1, -1, 0); _vm->_awayMission.tug.guard2Status = GUARDSTAT_DEAD; playSoundEffectIndex(SND_PHASSHOT); @@ -688,8 +685,7 @@ void Room::tug2Timer0Expired() { _roomVar.tug2.shootingTarget = OBJECT_SPOCK; _vm->_awayMission.timers[2] = 40; tug2GuardShootsCrewman(); - } - else if (_roomVar.tug2.shootKirkOverride) { + } else if (_roomVar.tug2.shootKirkOverride) { tug2DetermineElasiShooter(); _roomVar.tug2.shootingTarget = OBJECT_KIRK; _vm->_awayMission.timers[2] = 40; // TODO @@ -738,8 +734,7 @@ void Room::tug2GuardShootsCrewman() { bitmapArray = g1ShotsOnKill; else bitmapArray = g2ShotsOnKill; - } - else { + } else { anim = "_stune"; if (_roomVar.tug2.shootingObject == OBJECT_GUARD_1) bitmapArray = g1ShotsOnStun; diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp index 6c1b67409d..c0a0b97263 100644 --- a/engines/startrek/rooms/tug3.cpp +++ b/engines/startrek/rooms/tug3.cpp @@ -208,8 +208,8 @@ void Room::tug3ElasiStunnedOrKilled() { if (_vm->_awayMission.tug.bridgeWinMethod == 1) return; if (_vm->_awayMission.tug.bridgeElasi1Status == GUARDSTAT_UP || _vm->_awayMission.tug.bridgeElasi2Status == GUARDSTAT_UP - || _vm->_awayMission.tug.bridgeElasi3Status == GUARDSTAT_UP || _vm->_awayMission.tug.bridgeElasi4Status == GUARDSTAT_UP) - return; + || _vm->_awayMission.tug.bridgeElasi3Status == GUARDSTAT_UP || _vm->_awayMission.tug.bridgeElasi4Status == GUARDSTAT_UP) + return; // BUGFIX: if the ship is deorbiting, the mission isn't won yet. if (_vm->_awayMission.tug.orbitalDecayCounter != 0) @@ -342,15 +342,13 @@ void Room::tug3TalkToMccoy() { if (_vm->_awayMission.tug.orbitalDecayCounter >= 10) { if (_vm->_awayMission.tug.orbitalDecayCounter < 16) showText(TX_SPEAKER_MCCOY, TX_TUG3_011); - } - else if (_vm->_awayMission.tug.orbitalDecayCounter != 0) { + } else if (_vm->_awayMission.tug.orbitalDecayCounter != 0) { // BUGFIX: original game displays a blank textbox. An appropriate audio file // exists, but the corresponding text was written from scratch for ScummVM. // TODO: check if original floppy version has text for this. showText(TX_SPEAKER_MCCOY, TX_TUG3_012); } - } - else + } else showText(TX_SPEAKER_MCCOY, TX_TUG3_013); } @@ -359,8 +357,7 @@ void Room::tug3TalkToSpock() { if (_vm->_awayMission.tug.orbitalDecayCounter >= 10) { if (_vm->_awayMission.tug.orbitalDecayCounter < 16) showText(TX_SPEAKER_SPOCK, TX_TUG3_008); - } - else + } else showText(TX_SPEAKER_SPOCK, TX_TUG3_009); } } @@ -382,15 +379,14 @@ void Room::tug3UseCommunicator() { // BUGFIX: if still fighting the elasi, the mission isn't done yet. _vm->_awayMission.tug.orbitalDecayCounter = 0; if (!_vm->_awayMission.tug.elasiSurrendered && - (_vm->_awayMission.tug.bridgeElasi1Status == GUARDSTAT_UP - || _vm->_awayMission.tug.bridgeElasi2Status == GUARDSTAT_UP - || _vm->_awayMission.tug.bridgeElasi3Status == GUARDSTAT_UP - || _vm->_awayMission.tug.bridgeElasi4Status == GUARDSTAT_UP)) + (_vm->_awayMission.tug.bridgeElasi1Status == GUARDSTAT_UP + || _vm->_awayMission.tug.bridgeElasi2Status == GUARDSTAT_UP + || _vm->_awayMission.tug.bridgeElasi3Status == GUARDSTAT_UP + || _vm->_awayMission.tug.bridgeElasi4Status == GUARDSTAT_UP)) return; tug3EndMission(); - } - else { + } else { if (_vm->_awayMission.tug.orbitalDecayCounter < 16) { showText(TX_SPEAKER_KIRK, TX_TUG3_006); showText(TX_SPEAKER_SCOTT, TX_TUG3_S07); @@ -429,24 +425,20 @@ void Room::tug3Timer0Expired() { _vm->_awayMission.redshirtDead = true; loadActorAnim2(OBJECT_REDSHIRT, "rkills", -1, -1, 0); elasiTarget = OBJECT_REDSHIRT; - } - else if (!_vm->_awayMission.tug.crewmanKilled[OBJECT_KIRK]) { + } else if (!_vm->_awayMission.tug.crewmanKilled[OBJECT_KIRK]) { _vm->_awayMission.tug.crewmanKilled[OBJECT_KIRK] = 2; _vm->_awayMission.disableInput = true; loadActorAnim2(OBJECT_KIRK, "kkills", -1, -1, 0); elasiTarget = OBJECT_KIRK; - } - else if (!_vm->_awayMission.tug.crewmanKilled[OBJECT_SPOCK]) { + } else if (!_vm->_awayMission.tug.crewmanKilled[OBJECT_SPOCK]) { _vm->_awayMission.tug.crewmanKilled[OBJECT_SPOCK] = 2; loadActorAnim2(OBJECT_SPOCK, "skills", -1, -1, 0); elasiTarget = OBJECT_SPOCK; - } - else if (!_vm->_awayMission.tug.crewmanKilled[OBJECT_MCCOY]) { + } else if (!_vm->_awayMission.tug.crewmanKilled[OBJECT_MCCOY]) { _vm->_awayMission.tug.crewmanKilled[OBJECT_MCCOY] = 2; loadActorAnim2(OBJECT_MCCOY, "mkills", -1, -1, 13); elasiTarget = OBJECT_MCCOY; - } - else + } else return; playSoundEffectIndex(SND_PHASSHOT); @@ -465,13 +457,11 @@ void Room::tug3Timer1Expired() { showText(TX_SPEAKER_SHIPS_COMPUTER, TX_COMPU182); _vm->_awayMission.timers[1] = 100; _vm->_awayMission.tug.orbitalDecayCounter++; - } - else if (_vm->_awayMission.tug.orbitalDecayCounter < 16) { // Decay now unavoidable + } else if (_vm->_awayMission.tug.orbitalDecayCounter < 16) { // Decay now unavoidable showText(TX_SPEAKER_SHIPS_COMPUTER, TX_COMPU181); _vm->_awayMission.timers[1] = 100; _vm->_awayMission.tug.orbitalDecayCounter++; - } - else { // Game over + } else { // Game over showText(TX_TUG3N006); showGameOverMenu(); } |