diff options
-rw-r--r-- | engines/gnap/character.cpp | 7 | ||||
-rw-r--r-- | engines/gnap/gnap.cpp | 4 | ||||
-rw-r--r-- | engines/gnap/menu.cpp | 2 | ||||
-rw-r--r-- | engines/gnap/scenes/arcade.cpp | 18 | ||||
-rw-r--r-- | engines/gnap/scenes/group0.cpp | 95 | ||||
-rw-r--r-- | engines/gnap/scenes/group1.cpp | 145 | ||||
-rw-r--r-- | engines/gnap/scenes/group2.cpp | 89 | ||||
-rw-r--r-- | engines/gnap/scenes/group3.cpp | 34 | ||||
-rw-r--r-- | engines/gnap/scenes/group4.cpp | 84 | ||||
-rw-r--r-- | engines/gnap/scenes/group5.cpp | 4 | ||||
-rw-r--r-- | engines/gnap/scenes/scenecore.cpp | 6 |
11 files changed, 476 insertions, 12 deletions
diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp index 56e520068d..7f470eef07 100644 --- a/engines/gnap/character.cpp +++ b/engines/gnap/character.cpp @@ -375,6 +375,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { break; case kDirIdleLeft: case kDirIdleRight: + default: break; } } @@ -396,6 +397,7 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { break; case kDirIdleLeft: case kDirIdleRight: + default: break; } break; @@ -435,6 +437,9 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) { _idleFacing = kDirBottomRight; } break; + + default: + break; } return sequenceId | 0x10000; @@ -779,6 +784,8 @@ bool PlayerGnap::walkTo(Common::Point gridPos, int animationIndex, int sequenceI case 0x7BC: _idleFacing = kDirUpLeft; break; + default: + break; } } } else { diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index 1d31e6549b..a5434fb65f 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -757,6 +757,8 @@ void GnapEngine::initGameFlags(int num) { setFlag(kGFGrassTaken); setFlag(kGFBarnPadlockOpen); break; + default: + break; } } @@ -1055,6 +1057,8 @@ void GnapEngine::doCallback(int callback) { case 20: _scene->updateAnimationsCb(); break; + default: + break; } } diff --git a/engines/gnap/menu.cpp b/engines/gnap/menu.cpp index 34b5f18473..ac6492873a 100644 --- a/engines/gnap/menu.cpp +++ b/engines/gnap/menu.cpp @@ -257,6 +257,8 @@ void GnapEngine::runMenu() { case 4: updateMenuStatusQueryQuit(); break; + default: + break; } gameUpdateTick(); diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp index 2f1377dc2b..fd11586cab 100644 --- a/engines/gnap/scenes/arcade.cpp +++ b/engines/gnap/scenes/arcade.cpp @@ -142,6 +142,8 @@ void Scene49::checkObstacles() { _obstacles[j]._splashSequenceId = 0; _obstacles[j]._collisionSequenceId = 211; break; + default: + break; } _obstacles[j]._prevId = _truckId; _obstacles[j]._currId = _obstacles[j]._prevId; @@ -179,6 +181,8 @@ void Scene49::updateObstacle(int id) { else obstacle._prevId = _truckId - 1; break; + default: + break; } if (obstacle._currSequenceId == obstacle._closerSequenceId) { @@ -316,6 +320,8 @@ void Scene49::run() { _truckSequenceId = 0xAF; _truckLaneNum = 3; break; + default: + break; } int bgWidth1 = gameSys.getSpriteWidthById(0x5E); @@ -410,6 +416,8 @@ void Scene49::run() { case 0xB2: _truckLaneNum = 3; break; + default: + break; } animToggle3 = !animToggle3; if (_truckLaneNum == 1) { @@ -682,6 +690,8 @@ void Scene50::playRoundAnim(int roundNum) { case 3: sequenceId = 0xB1; break; + default: + break; } _vm->_gameSys->insertSequence(sequenceId, 256, 0, 0, kSeqNone, 0, 0, 0); @@ -765,6 +775,8 @@ int Scene50::getRightTongueAction() { case 4: sequenceId = 0xBB; break; + default: + break; } } else { switch (_vm->getRandom(4)) { @@ -780,6 +792,8 @@ int Scene50::getRightTongueAction() { case 3: sequenceId = 0xBE; break; + default: + break; } } } @@ -1557,6 +1571,8 @@ void Scene51::updateGuyAnimation() { case 4: _guyNextSequenceId = 0xC7; break; + default: + break; } _vm->_gameSys->insertSequence(_guyNextSequenceId, 39, _guySequenceId, 39, kSeqSyncWait, 0, 0, 0); @@ -1580,6 +1596,8 @@ int Scene51::incCashAmount(int sequenceId) { if (_cashAmount < 0) _cashAmount = 0; break; + default: + break; } if (_cashAmount > 1995) _cashAmount = 1995; diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp index 7967df0e6f..a27bee507d 100644 --- a/engines/gnap/scenes/group0.cpp +++ b/engines/gnap/scenes/group0.cpp @@ -144,6 +144,8 @@ void Scene01::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -165,6 +167,8 @@ void Scene01::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -187,6 +191,8 @@ void Scene01::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -216,6 +222,8 @@ void Scene01::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -332,6 +340,9 @@ void Scene01::updateAnimations() { gameSys.insertSequence(135, 39, 0, 0, kSeqNone, 25, _vm->getRandom(140) - 40, 0); gnap._actionStatus = -1; break; + + default: + break; } } @@ -497,6 +508,8 @@ void Scene02::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -531,6 +544,8 @@ void Scene02::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -578,6 +593,8 @@ void Scene02::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -601,6 +618,8 @@ void Scene02::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -778,6 +797,8 @@ void Scene02::updateAnimations() { case 2: _gnapTruckSequenceId = 0x157; break; + default: + break; } _truckGrillCtr = (_truckGrillCtr + 1) % 3; gameSys.insertSequence(_gnapTruckSequenceId, gnap._id, makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, kSeqSyncWait, 0, 0, 0); @@ -965,6 +986,8 @@ void Scene03::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -992,6 +1015,8 @@ void Scene03::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1034,6 +1059,8 @@ void Scene03::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1077,6 +1104,8 @@ void Scene03::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1475,6 +1504,8 @@ void Scene04::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1499,6 +1530,8 @@ void Scene04::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1524,6 +1557,8 @@ void Scene04::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1556,6 +1591,8 @@ void Scene04::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1587,6 +1624,8 @@ void Scene04::run() { case TALK_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1631,6 +1670,8 @@ void Scene04::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1950,6 +1991,8 @@ void Scene05::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1982,6 +2025,8 @@ void Scene05::run() { gnap.playIdle(plat._pos); } break; + default: + break; } } } @@ -2014,6 +2059,8 @@ void Scene05::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2037,6 +2084,8 @@ void Scene05::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2073,6 +2122,8 @@ void Scene05::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2210,6 +2261,8 @@ void Scene05::updateAnimations() { _nextChickenSequenceId = 0x14F; gnap._actionStatus = -1; break; + default: + break; } } @@ -2379,6 +2432,8 @@ void Scene06::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2413,6 +2468,8 @@ void Scene06::run() { else gnap.playScratchingHead(Common::Point(5, 0)); break; + default: + break; } } } @@ -2440,6 +2497,8 @@ void Scene06::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2478,6 +2537,8 @@ void Scene06::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2538,6 +2599,8 @@ void Scene06::run() { case 4: _nextHorseSequenceId = 0xF4; break; + default: + break; } } } @@ -2753,6 +2816,8 @@ void Scene07::run() { break; case PLAT_CURSOR: break; + default: + break; } break; @@ -2789,6 +2854,8 @@ void Scene07::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -2876,6 +2943,8 @@ void Scene07::updateAnimations() { _vm->_newSceneNum = 8; _vm->_sceneDone = true; break; + default: + break; } gnap._actionStatus = -1; } @@ -3018,6 +3087,8 @@ void Scene08::run() { break; case PLAT_CURSOR: break; + default: + break; } } break; @@ -3068,6 +3139,8 @@ void Scene08::run() { plat._idleFacing = kDirIdleLeft; gnap.playIdle(Common::Point(6, 6)); break; + default: + break; } } break; @@ -3104,6 +3177,8 @@ void Scene08::run() { plat._idleFacing = kDirIdleLeft; gnap.playIdle(Common::Point(3, 7)); break; + default: + break; } } break; @@ -3130,6 +3205,8 @@ void Scene08::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -3156,6 +3233,8 @@ void Scene08::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -3182,6 +3261,8 @@ void Scene08::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -3224,6 +3305,8 @@ void Scene08::run() { case 3: _nextManSequenceId = 0x13A; break; + default: + break; } } } @@ -3282,6 +3365,8 @@ void Scene08::updateAnimations() { _nextDogSequenceId = 0x13C; gnap._actionStatus = -1; break; + default: + break; } } @@ -3295,6 +3380,8 @@ void Scene08::updateAnimations() { _nextManSequenceId = 0x140; plat._actionStatus = -1; break; + default: + break; } } @@ -3334,6 +3421,8 @@ void Scene08::updateAnimations() { _vm->_hotspots[kHS08Toy]._flags = SF_DISABLED | SF_WALKABLE; gameSys.removeSequence(0x146, 1, true); break; + default: + break; } _currDogSequenceId = _nextDogSequenceId; _nextDogSequenceId = 0x134; @@ -3451,6 +3540,8 @@ void Scene09::run() { break; case PLAT_CURSOR: break; + default: + break; } break; @@ -3488,6 +3579,8 @@ void Scene09::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -3563,6 +3656,8 @@ void Scene09::updateAnimations() { _vm->_timers[4] = _vm->getRandom(150) + 100; gnap._actionStatus = -1; break; + default: + break; } } } diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp index 9585d37c84..f64b26dd4a 100644 --- a/engines/gnap/scenes/group1.cpp +++ b/engines/gnap/scenes/group1.cpp @@ -127,6 +127,8 @@ void Scene10::run() { break; case PLAT_CURSOR: break; + default: + break; } } break; @@ -176,6 +178,8 @@ void Scene10::run() { gnap.walkTo(Common::Point(4, 8), 0, 0x107BB, 1); gnap._actionStatus = kAS10AnnoyCook; break; + default: + break; } } break; @@ -192,9 +196,9 @@ void Scene10::run() { gnap.playScratchingHead(Common::Point(4, 3)); break; case GRAB_CURSOR: - if (_vm->isFlag(kGFMudTaken)) + if (_vm->isFlag(kGFMudTaken)) { gnap.playMoan2(Common::Point(-1, -1)); - else { + } else { gnap.actionIdle(0x10C); gnap.walkTo(Common::Point(4, 8), 0, 0x107BB, 1); gnap._actionStatus = kAS10AnnoyCook; @@ -204,9 +208,9 @@ void Scene10::run() { gnap.playImpossible(); break; case PLAT_CURSOR: - if (_vm->isFlag(kGFMudTaken)) + if (_vm->isFlag(kGFMudTaken)) { gnap.playMoan2(Common::Point(-1, -1)); - else { + } else { gnap.actionIdle(0x10C); gnap.useDeviceOnPlatypus(); plat.walkTo(Common::Point(3, 7), -1, -1, 1); @@ -214,6 +218,8 @@ void Scene10::run() { gnap._actionStatus = kAS10AnnoyCook; } break; + default: + break; } } break; @@ -235,9 +241,9 @@ void Scene10::run() { gnap.playImpossible(); break; case PLAT_CURSOR: - if (_vm->isFlag(kGFMudTaken)) + if (_vm->isFlag(kGFMudTaken)) { gnap.playMoan2(Common::Point(-1, -1)); - else { + } else { _vm->invAdd(kItemTongs); _vm->setFlag(kGFMudTaken); gnap.actionIdle(0x10C); @@ -249,6 +255,8 @@ void Scene10::run() { gnap.playIdle(Common::Point(7, 6)); } break; + default: + break; } } break; @@ -276,6 +284,8 @@ void Scene10::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -356,6 +366,8 @@ void Scene10::updateAnimations() { case kAS10AnnoyCook: _nextCookSequenceId = 0x105; break; + default: + break; } } @@ -365,6 +377,8 @@ void Scene10::updateAnimations() { case kAS10PlatWithBox: _nextCookSequenceId = 0x109; break; + default: + break; } } @@ -415,9 +429,9 @@ void Scene10::updateAnimations() { switch (_currCookSequenceId) { case 0x106: - if (gnap._actionStatus >= 0 || plat._actionStatus >= 0) + if (gnap._actionStatus >= 0 || plat._actionStatus >= 0) { _nextCookSequenceId = 0x106; - else { + } else { int rnd = _vm->getRandom(7); switch (rnd) { case 0: @@ -432,6 +446,7 @@ void Scene10::updateAnimations() { break; default: _nextCookSequenceId = 0x106; + break; } } break; @@ -465,6 +480,7 @@ void Scene10::updateAnimations() { break; default: _nextCookSequenceId = 0x106; + break; } } _vm->_timers[2] = _vm->getRandom(30) + 20; @@ -476,11 +492,14 @@ void Scene10::updateAnimations() { gnap._actionStatus = -1; plat._actionStatus = -1; break; + default: + break; } - if (_currCookSequenceId == 0x843) + if (_currCookSequenceId == 0x843) { gameSys.setAnimation(_currCookSequenceId | 0x10000, 301, 2); - else + } else { gameSys.setAnimation(_currCookSequenceId, 100, 2); + } } } @@ -622,6 +641,8 @@ void Scene11::run() { break; case PLAT_CURSOR: break; + default: + break; } } break; @@ -672,6 +693,8 @@ void Scene11::run() { gnap.walkTo(Common::Point(3, 7), 0, gnap.getSequenceId(kGSBrainPulsating, Common::Point(0, 0)) | 0x10000, 1); gnap._actionStatus = kAS11TalkGoggleGuy; break; + default: + break; } } } @@ -701,6 +724,8 @@ void Scene11::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -723,6 +748,8 @@ void Scene11::run() { case PLAT_CURSOR: gnap.playImpossible(Common::Point(9, 8)); break; + default: + break; } } } @@ -750,7 +777,6 @@ void Scene11::run() { _vm->_mouseClickState._left = false; } break; - } updateAnimations(); @@ -808,6 +834,8 @@ void Scene11::run() { case 2: gameSys.insertSequence(0x8A6 | 0x10000, 179, 0, 0, kSeqNone, 0, 0, 0); break; + default: + break; } } } @@ -893,6 +921,8 @@ void Scene11::updateAnimations() { gnap._actionStatus = -1; } break; + default: + break; } } @@ -1045,6 +1075,8 @@ void Scene12::run() { break; case PLAT_CURSOR: break; + default: + break; } break; @@ -1095,6 +1127,8 @@ void Scene12::run() { plat._idleFacing = kDirIdleRight; gnap.playIdle(Common::Point(2, 7)); break; + default: + break; } } break; @@ -1130,6 +1164,8 @@ void Scene12::run() { gameSys.setAnimation(makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id, 0); gnap._actionStatus = kAS12PlatWithBarkeeper; break; + default: + break; } } break; @@ -1165,6 +1201,8 @@ void Scene12::run() { plat._idleFacing = kDirIdleLeft; gnap.playIdle(Common::Point(7, 6)); break; + default: + break; } } break; @@ -1190,7 +1228,6 @@ void Scene12::run() { _vm->_mouseClickState._left = false; } break; - } updateAnimations(); @@ -1247,6 +1284,8 @@ void Scene12::run() { case 2: gameSys.insertSequence(0x8A6 | 0x10000, 179, 0, 0, kSeqNone, 0, 0, 0); break; + default: + break; } } } @@ -1360,6 +1399,8 @@ void Scene12::updateAnimations() { case kAS12PlatWithBarkeeper: _nextBarkeeperSequenceId = 0x1F9; break; + default: + break; } } @@ -1372,6 +1413,8 @@ void Scene12::updateAnimations() { case kAS12PlatWithBeardGuy: _nextBeardGuySequenceId = 0x1F3; break; + default: + break; } } @@ -1558,6 +1601,8 @@ void Scene13::run() { break; case PLAT_CURSOR: break; + default: + break; } break; @@ -1601,6 +1646,8 @@ void Scene13::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1618,6 +1665,8 @@ void Scene13::run() { gnap._actionStatus = kAS13FrontToilet; gnap._idleFacing = kDirBottomRight; break; + default: + break; } } break; @@ -1642,6 +1691,8 @@ void Scene13::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1664,6 +1715,8 @@ void Scene13::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1686,6 +1739,8 @@ void Scene13::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1739,6 +1794,8 @@ void Scene13::run() { case 4: _vm->playSound(0xD6, false); break; + default: + break; } } if (!_vm->_timers[5]) { @@ -1838,6 +1895,8 @@ void Scene13::updateAnimations() { _vm->_timers[2] = 360; gnap._actionStatus = kAS13Wait; break; + default: + break; } } @@ -1938,6 +1997,8 @@ void Scene14::run() { case PLAT_CURSOR: gameSys.insertSequence(0x107A8, 1, 0, 0, kSeqNone, 0, 900 - gnap._gridX, 576 - gnap._gridY); break; + default: + break; } } break; @@ -1957,6 +2018,8 @@ void Scene14::run() { case PLAT_CURSOR: gameSys.insertSequence(0x107A8, 1, 0, 0, kSeqNone, 0, 900 - gnap._gridX, 576 - gnap._gridY); break; + default: + break; } } break; @@ -2105,6 +2168,8 @@ void Scene15::run() { case PLAT_CURSOR: gameSys.insertSequence(0x107A8, 1, 0, 0, kSeqNone, 0, 900 - gnap._gridX, 576 - gnap._gridY); break; + default: + break; } } break; @@ -2132,6 +2197,8 @@ void Scene15::run() { case PLAT_CURSOR: gameSys.insertSequence(0x107A8, 1, 0, 0, kSeqNone, 0, 900 - gnap._gridX, 576 - gnap._gridY); break; + default: + break; } } break; @@ -2158,6 +2225,8 @@ void Scene15::run() { case PLAT_CURSOR: gameSys.insertSequence(0x107A8, 1, 0, 0, kSeqNone, 0, 900 - gnap._gridX, 576 - gnap._gridY); break; + default: + break; } } break; @@ -2184,6 +2253,8 @@ void Scene15::run() { case PLAT_CURSOR: gameSys.insertSequence(0x107A8, 1, 0, 0, kSeqNone, 0, 900 - gnap._gridX, 576 - gnap._gridY); break; + default: + break; } } break; @@ -2257,6 +2328,8 @@ void Scene15::updateAnimations() { _currLowerButtonSequenceId = -1; } break; + default: + break; } } else if (_nextRecordSequenceId != -1) { gameSys.setAnimation(_nextRecordSequenceId, 1, 0); @@ -2586,6 +2659,8 @@ void Scene17::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2617,6 +2692,8 @@ void Scene17::run() { } else gnap.playImpossible(); break; + default: + break; } } } @@ -2658,6 +2735,8 @@ void Scene17::run() { } else gnap.playImpossible(); break; + default: + break; } } } @@ -2702,6 +2781,8 @@ void Scene17::run() { } else gnap.playImpossible(); break; + default: + break; } } } @@ -2773,6 +2854,8 @@ void Scene17::run() { case 2: gameSys.insertSequence(0x25E, 255, 0, 0, kSeqNone, 0, 0, 0); break; + default: + break; } } } @@ -2796,6 +2879,8 @@ void Scene17::run() { case 5: _nextWrenchSequenceId = 0x22E; break; + default: + break; } } else { --_wrenchCtr; @@ -2819,6 +2904,8 @@ void Scene17::run() { case 5: _nextWrenchSequenceId = 0x235; break; + default: + break; } } else { _wrenchCtr = 2; @@ -2903,6 +2990,8 @@ void Scene17::updateAnimations() { case kAS17LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -2963,6 +3052,8 @@ void Scene17::updateAnimations() { case kAS17LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -3102,6 +3193,8 @@ void Scene17::updateAnimations() { updateHotspots(); _vm->_timers[5] = _vm->getRandom(30) + 80; break; + default: + break; } } @@ -3493,6 +3586,8 @@ void Scene18::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3521,6 +3616,8 @@ void Scene18::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3567,6 +3664,8 @@ void Scene18::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3607,6 +3706,8 @@ void Scene18::run() { putDownGarbageCan(0); gnap.playImpossible(); break; + default: + break; } } } else { @@ -3633,6 +3734,8 @@ void Scene18::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3678,6 +3781,8 @@ void Scene18::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -4053,6 +4158,8 @@ void Scene18::updateAnimations() { updateHotspots(); gnap._actionStatus = -1; break; + default: + break; } } @@ -4206,6 +4313,8 @@ void Scene19::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -4245,6 +4354,8 @@ void Scene19::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -4268,6 +4379,8 @@ void Scene19::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -4297,6 +4410,8 @@ void Scene19::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -4320,6 +4435,8 @@ void Scene19::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -4433,6 +4550,8 @@ void Scene19::updateAnimations() { case kAS19LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -4494,6 +4613,8 @@ void Scene19::updateAnimations() { _currShopAssistantSequenceId = _nextShopAssistantSequenceId; _nextShopAssistantSequenceId = -1; break; + default: + break; } } } diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp index d68725cce9..01e4a3c6f5 100644 --- a/engines/gnap/scenes/group2.cpp +++ b/engines/gnap/scenes/group2.cpp @@ -183,6 +183,8 @@ void Scene20::run() { case 3: _currStonerGuySequenceId = 0x173; break; + default: + break; } _nextStonerGuySequenceId = -1; @@ -297,6 +299,8 @@ void Scene20::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -394,6 +398,8 @@ void Scene20::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -422,6 +428,8 @@ void Scene20::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -450,6 +458,8 @@ void Scene20::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -502,6 +512,8 @@ void Scene20::run() { case 2: gameSys.insertSequence(0x185, 253, 0, 0, kSeqNone, 0, 0, 0); break; + default: + break; } } } @@ -639,6 +651,8 @@ void Scene20::updateAnimations() { _vm->setGrabCursorSprite(kItemJoint); gnap._actionStatus = -1; break; + default: + break; } } @@ -818,6 +832,8 @@ void Scene21::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -840,6 +856,7 @@ void Scene21::run() { break; case TALK_CURSOR: case PLAT_CURSOR: + default: break; } } @@ -874,6 +891,8 @@ void Scene21::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -987,6 +1006,8 @@ void Scene21::updateAnimations() { case kAS21LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -1139,6 +1160,8 @@ void Scene22::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1184,6 +1207,8 @@ void Scene22::run() { case PLAT_CURSOR: gnap.useDeviceOnPlatypus(); break; + default: + break; } } } @@ -1260,6 +1285,8 @@ void Scene22::updateAnimations() { case kAS22TalkCashier: _nextCashierSequenceId = 0x5C; break; + default: + break; } gnap._actionStatus = -1; } @@ -1366,6 +1393,8 @@ void Scene23::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1400,6 +1429,8 @@ void Scene23::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1447,6 +1478,8 @@ void Scene23::run() { case 3: gameSys.insertSequence(0xB9, 256, 0, 0, kSeqNone, 0, 0, 0); break; + default: + break; } } if (!_vm->_timers[5]) { @@ -1461,6 +1494,8 @@ void Scene23::run() { case 2: _vm->playSound(0xCF, false); break; + default: + break; } } } @@ -1503,6 +1538,8 @@ void Scene23::updateAnimations() { case kAS23LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -1634,6 +1671,8 @@ void Scene24::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1706,6 +1745,8 @@ void Scene24::run() { case 2: _nextWomanSequenceId = 0x34; break; + default: + break; } gameSys.insertSequence(_nextWomanSequenceId, 20, _currWomanSequenceId, 20, kSeqSyncWait, 0, 0, 0); _currWomanSequenceId = _nextWomanSequenceId; @@ -1722,6 +1763,8 @@ void Scene24::run() { case 2: gameSys.insertSequence(0x3A, 253, 0, 0, kSeqNone, 0, 0, 0); break; + default: + break; } } _vm->playSoundA(); @@ -1797,6 +1840,8 @@ void Scene25::playAnims(int index) { case 4: _vm->_largeSprite = gameSys.createSurface(0x28); break; + default: + break; } gameSys.insertSpriteDrawItem(_vm->_largeSprite, 0, 0, 300); _vm->delayTicksCursor(5); @@ -1881,6 +1926,8 @@ void Scene25::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1911,6 +1958,8 @@ void Scene25::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1970,6 +2019,8 @@ void Scene25::run() { case PLAT_CURSOR: gnap.playMoan2(); break; + default: + break; } } } @@ -2086,6 +2137,8 @@ void Scene25::updateAnimations() { case kAS25LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -2200,6 +2253,8 @@ void Scene26::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2434,6 +2489,8 @@ void Scene27::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2461,6 +2518,8 @@ void Scene27::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2484,6 +2543,8 @@ void Scene27::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2606,6 +2667,8 @@ void Scene27::updateAnimations() { case 2: _nextJanitorSequenceId = 0xCE; break; + default: + break; } break; case kAS27GrabBucket: @@ -2647,6 +2710,8 @@ void Scene27::updateAnimations() { case kAS27LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -2806,6 +2871,8 @@ void Scene28::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2839,6 +2906,8 @@ void Scene28::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2879,6 +2948,8 @@ void Scene28::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2915,6 +2986,8 @@ void Scene28::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3048,6 +3121,8 @@ void Scene28::updateAnimations() { case kAS28LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -3088,6 +3163,8 @@ void Scene28::updateAnimations() { gnap._sequenceDatNum = 0; _nextClownSequenceId = -1; break; + default: + break; } if (_nextClownSequenceId != -1) { gameSys.insertSequence(_nextClownSequenceId, 39, _currClownSequenceId, 39, kSeqSyncWait, 0, 0, 0); @@ -3203,6 +3280,8 @@ void Scene29::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3231,6 +3310,8 @@ void Scene29::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3277,6 +3358,8 @@ void Scene29::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -3325,6 +3408,8 @@ void Scene29::run() { case 4: _nextManSequenceId = 0xF1; break; + default: + break; } } } @@ -3357,6 +3442,8 @@ void Scene29::updateAnimations() { case kAS29LeaveScene: _vm->_sceneDone = true; break; + default: + break; } } @@ -3407,6 +3494,8 @@ void Scene29::updateAnimations() { case 5: _nextMonkeySequenceId = 0xE7; break; + default: + break; } gameSys.insertSequence(_nextMonkeySequenceId, 159, _currMonkeySequenceId, 159, kSeqSyncWait, 0, 0, 0); gameSys.setAnimation(_nextMonkeySequenceId, 159, 4); diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp index 4f2282d731..ca18382e2b 100644 --- a/engines/gnap/scenes/group3.cpp +++ b/engines/gnap/scenes/group3.cpp @@ -109,6 +109,8 @@ void Scene30::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -137,6 +139,8 @@ void Scene30::run() { case PLAT_CURSOR: gnap.playImpossible(Common::Point(8, 5)); break; + default: + break; } } } @@ -268,6 +272,8 @@ void Scene30::updateAnimations() { _vm->showFullScreenSprite(0xE2); gnap._actionStatus = -1; break; + default: + break; } } } @@ -367,6 +373,8 @@ void Scene31::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -410,6 +418,8 @@ void Scene31::run() { } else gnap.playImpossible(); break; + default: + break; } } } @@ -447,6 +457,8 @@ void Scene31::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -576,6 +588,8 @@ void Scene31::updateAnimations() { _vm->_sceneDone = true; gnap._actionStatus = -1; break; + default: + break; } } @@ -720,6 +734,8 @@ void Scene32::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -748,6 +764,8 @@ void Scene32::run() { gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + default: + break; } if (_vm->_mouseClickState._left && gnap._actionStatus < 0) { @@ -898,6 +916,8 @@ void Scene33::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -925,6 +945,8 @@ void Scene33::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1182,6 +1204,8 @@ void Scene38::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } break; @@ -1245,6 +1269,8 @@ void Scene38::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1385,6 +1411,8 @@ void Scene38::updateAnimations() { plat._actionStatus = kAS38PlatypusHoldingTrapDoor; updateHotspots(); break; + default: + break; } } @@ -1492,6 +1520,8 @@ void Scene39::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -1523,6 +1553,8 @@ void Scene39::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -1572,6 +1604,8 @@ void Scene39::run() { case 3: _nextGuySequenceId = 0x33; break; + default: + break; } } } diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp index e272eb9734..51412c96f9 100644 --- a/engines/gnap/scenes/group4.cpp +++ b/engines/gnap/scenes/group4.cpp @@ -95,6 +95,8 @@ void Scene40::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -340,6 +342,9 @@ void Scene41::run() { _vm->_timers[4] = _vm->getRandom(100) + 100; _vm->_timers[5] = _vm->getRandom(30) + 20; break; + + default: + break; } } else { switch (_vm->_sceneClickedHotspot) { @@ -369,6 +374,8 @@ void Scene41::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -420,6 +427,8 @@ void Scene41::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -448,6 +457,8 @@ void Scene41::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -464,6 +475,9 @@ void Scene41::run() { if (gnap._actionStatus < 0) gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + + default: + break; } } @@ -529,6 +543,8 @@ void Scene41::run() { case 2: _nextToyVendorSequenceId = 0x119; break; + default: + break; } if (_nextToyVendorSequenceId == _currToyVendorSequenceId) _nextToyVendorSequenceId = -1; @@ -660,6 +676,8 @@ void Scene41::updateAnimations() { updateHotspots(); } break; + default: + break; } } @@ -856,6 +874,9 @@ void Scene42::run() { _vm->runMenu(); updateHotspots(); break; + + default: + break; } } else { switch (_vm->_sceneClickedHotspot) { @@ -884,6 +905,8 @@ void Scene42::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -935,6 +958,8 @@ void Scene42::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -955,6 +980,8 @@ void Scene42::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -965,6 +992,8 @@ void Scene42::run() { gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + default: + break; } } @@ -1007,6 +1036,8 @@ void Scene42::run() { case 7: _nextBBQVendorSequenceId = 0x14A; break; + default: + break; } if (_nextBBQVendorSequenceId == _currBBQVendorSequenceId && _nextBBQVendorSequenceId != 0x14D) _nextBBQVendorSequenceId = -1; @@ -1317,6 +1348,9 @@ void Scene43::run() { _vm->toyUfoFlyTo(497, 143, 0, 799, 0, 300, 3); _vm->_timers[9] = 600; break; + + default: + break; } } else { switch (_vm->_sceneClickedHotspot) { @@ -1345,6 +1379,8 @@ void Scene43::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -1391,6 +1427,8 @@ void Scene43::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1413,6 +1451,8 @@ void Scene43::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1422,6 +1462,9 @@ void Scene43::run() { if (gnap._actionStatus < 0) gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + + default: + break; } } @@ -1463,6 +1506,8 @@ void Scene43::run() { case 4: _nextTwoHeadedGuySequenceId = 0x13A; break; + default: + break; } if (_nextTwoHeadedGuySequenceId == _currTwoHeadedGuySequenceId) _nextTwoHeadedGuySequenceId = -1; @@ -1768,6 +1813,9 @@ void Scene44::run() { updateHotspots(); _vm->_timers[4] = _vm->getRandom(20) + 20; break; + + default: + break; } } else if (_vm->_sceneClickedHotspot <= 9) { switch (_vm->_sceneClickedHotspot) { @@ -1796,6 +1844,8 @@ void Scene44::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -1849,6 +1899,8 @@ void Scene44::run() { gnap.playIdle(Common::Point(5, 7)); plat._actionStatus = 4; break; + default: + break; } } break; @@ -1875,6 +1927,8 @@ void Scene44::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1898,6 +1952,8 @@ void Scene44::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -1908,6 +1964,8 @@ void Scene44::run() { gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + default: + break; } } @@ -2002,6 +2060,8 @@ void Scene44::updateAnimations() { case 2: _nextKissingLadySequenceId = 0xF2; break; + default: + break; } gnap._actionStatus = -1; } @@ -2262,6 +2322,9 @@ void Scene45::run() { _vm->runMenu(); updateHotspots(); break; + + default: + break; } } else { switch (_vm->_sceneClickedHotspot) { @@ -2291,6 +2354,8 @@ void Scene45::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -2351,6 +2416,8 @@ void Scene45::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } } @@ -2360,6 +2427,9 @@ void Scene45::run() { if (gnap._actionStatus < 0) gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + + default: + break; } } @@ -2591,6 +2661,9 @@ void Scene46::run() { _vm->runMenu(); updateHotspots(); break; + + default: + break; } } else { switch (_vm->_sceneClickedHotspot) { @@ -2618,6 +2691,8 @@ void Scene46::run() { case PLAT_CURSOR: gnap.playImpossible(plat._pos); break; + default: + break; } } } @@ -2640,6 +2715,8 @@ void Scene46::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -2661,6 +2738,8 @@ void Scene46::run() { case PLAT_CURSOR: gnap.playImpossible(); break; + default: + break; } } break; @@ -2692,6 +2771,9 @@ void Scene46::run() { if (gnap._actionStatus < 0) gnap.walkTo(Common::Point(-1, -1), -1, -1, 1); break; + + default: + break; } } @@ -2757,6 +2839,8 @@ void Scene46::updateAnimations() { case 2: _nextSackGuySequenceId = 0x4A; break; + default: + break; } gnap._actionStatus = -1; } diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp index 85cf3d1834..818b135e0f 100644 --- a/engines/gnap/scenes/group5.cpp +++ b/engines/gnap/scenes/group5.cpp @@ -213,6 +213,8 @@ void Scene53::runChitChatLine() { case 13: pressPhoneNumberButton(0, _vm->_sceneClickedHotspot - 1); break; + default: + break; } if (flag && sequenceId != -1) { @@ -365,6 +367,8 @@ void Scene53::run() { _vm->_newSceneNum = 17; } break; + default: + break; } _vm->checkGameKeys(); diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp index 8d59aa4b15..903c03cdd4 100644 --- a/engines/gnap/scenes/scenecore.cpp +++ b/engines/gnap/scenes/scenecore.cpp @@ -399,6 +399,8 @@ int GnapEngine::initSceneLogic() { _gameSys->setScaleValues(0, 500, 1, 1000); initSceneGrid(21, 146, 11, 10); break; + default: + break; } return backgroundId; @@ -607,6 +609,8 @@ void GnapEngine::runSceneLogic() { _gameDone = true; } break; + default: + break; } } @@ -626,6 +630,8 @@ void Scene::playRandomSound(int timerIndex) { case 3: _vm->playSound(0x1091D, false); break; + default: + break; } } } |