[Scummvm-git-logs] scummvm master -> b7c397412dd2cd5aa81723fa31d9e13ee83e1493
digitall
547637+digitall at users.noreply.github.com
Sun Dec 1 21:45:09 UTC 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b7c397412d PEGASUS: Fix Missing Default Switch Cases
Commit: b7c397412dd2cd5aa81723fa31d9e13ee83e1493
https://github.com/scummvm/scummvm/commit/b7c397412dd2cd5aa81723fa31d9e13ee83e1493
Author: D G Turner (digitall at scummvm.org)
Date: 2019-12-01T21:41:21Z
Commit Message:
PEGASUS: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Changed paths:
engines/pegasus/ai/ai_area.cpp
engines/pegasus/input.cpp
engines/pegasus/interface.cpp
engines/pegasus/items/biochips/aichip.cpp
engines/pegasus/items/biochips/mapimage.cpp
engines/pegasus/items/biochips/opticalchip.cpp
engines/pegasus/items/biochips/pegasuschip.cpp
engines/pegasus/items/inventory/airmask.cpp
engines/pegasus/items/item.cpp
engines/pegasus/menu.cpp
engines/pegasus/neighborhood/caldoria/caldoria.cpp
engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
engines/pegasus/neighborhood/mars/mars.cpp
engines/pegasus/neighborhood/mars/spacejunk.cpp
engines/pegasus/neighborhood/neighborhood.cpp
engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
engines/pegasus/neighborhood/norad/delta/globegame.cpp
engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
engines/pegasus/neighborhood/norad/pressuredoor.cpp
engines/pegasus/neighborhood/norad/subcontrolroom.cpp
engines/pegasus/neighborhood/norad/subplatform.cpp
engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
engines/pegasus/neighborhood/tsa/fulltsa.cpp
engines/pegasus/neighborhood/tsa/tinytsa.cpp
engines/pegasus/neighborhood/wsc/wsc.cpp
engines/pegasus/pegasus.cpp
diff --git a/engines/pegasus/ai/ai_area.cpp b/engines/pegasus/ai/ai_area.cpp
index 58698e6..34ca93e 100644
--- a/engines/pegasus/ai/ai_area.cpp
+++ b/engines/pegasus/ai/ai_area.cpp
@@ -197,6 +197,8 @@ void AIArea::setAIAreaToTime(const LowerClientSignature client, const LowerAreaS
setRightMovieTime(time);
}
break;
+ default:
+ break;
}
}
@@ -269,6 +271,8 @@ void AIArea::playAIAreaSequence(const LowerClientSignature, const LowerAreaSigna
vm->_cursor->hideUntilMoved();
setAIAreaToTime(_rightAreaOwner, kRightAreaSignature, _rightBiochipTime);
break;
+ default:
+ break;
}
unlockAI();
@@ -454,6 +458,8 @@ void AIArea::activateHotspots() {
case kOpticalBiochip:
((OpticalChip *)currentBiochip)->activateOpticalHotspots();
break;
+ default:
+ break;
}
} else if (_middleAreaOwner == kInventorySignature) {
InventoryItem *currentItem = ((PegasusEngine *)g_engine)->getCurrentInventoryItem();
@@ -492,6 +498,8 @@ void AIArea::clickInHotspot(const Input &input, const Hotspot *hotspot) {
handled = true;
}
break;
+ default:
+ break;
}
}
} else if (_middleAreaOwner == kInventorySignature) {
@@ -505,6 +513,8 @@ void AIArea::clickInHotspot(const Input &input, const Hotspot *hotspot) {
handled = true;
}
break;
+ default:
+ break;
}
}
}
@@ -569,6 +579,8 @@ void AIArea::checkMiddleArea() {
case kPegasusBiochip:
((PegasusChip *)currentBiochip)->setUpPegasusChip();
break;
+ default:
+ break;
}
} else {
switch (currentBiochip->getObjectID()) {
@@ -578,6 +590,8 @@ void AIArea::checkMiddleArea() {
case kPegasusBiochip:
((PegasusChip *)currentBiochip)->setUpPegasusChipRude();
break;
+ default:
+ break;
}
}
}
diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index 6738ad4..b44deff 100644
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -200,6 +200,8 @@ uint InputDeviceManager::convertJoystickToKey(uint joybutton) {
return Common::KEYCODE_LEFT;
case Common::JOYSTICK_BUTTON_DPAD_RIGHT:
return Common::KEYCODE_RIGHT;
+ default:
+ break;
}
return 0;
}
diff --git a/engines/pegasus/interface.cpp b/engines/pegasus/interface.cpp
index 54ddffc..a0b3c1c 100644
--- a/engines/pegasus/interface.cpp
+++ b/engines/pegasus/interface.cpp
@@ -375,6 +375,8 @@ void Interface::receiveNotification(Notification *notification, const Notificati
case kBiochipDrawerDownFlag:
biochipDrawerDown(true);
break;
+ default:
+ break;
}
}
}
diff --git a/engines/pegasus/items/biochips/aichip.cpp b/engines/pegasus/items/biochips/aichip.cpp
index b07e869..654ab69 100644
--- a/engines/pegasus/items/biochips/aichip.cpp
+++ b/engines/pegasus/items/biochips/aichip.cpp
@@ -165,6 +165,8 @@ void AIChip::activateAIHotspots() {
case 1:
_hint1Spot.setActive();
break;
+ default:
+ break;
}
if (GameState.getWalkthroughMode() && vm->canSolve())
@@ -241,6 +243,8 @@ void AIChip::clickInAIHotspot(HotSpotID id) {
case kAISolveSpotID:
g_neighborhood->doSolve();
break;
+ default:
+ break;
}
ItemState state = getItemState();
diff --git a/engines/pegasus/items/biochips/mapimage.cpp b/engines/pegasus/items/biochips/mapimage.cpp
index a801e4a..6f7ef50 100644
--- a/engines/pegasus/items/biochips/mapimage.cpp
+++ b/engines/pegasus/items/biochips/mapimage.cpp
@@ -416,6 +416,8 @@ void MapImage::drawPlayer() {
screen->drawLine(gridX + 1, gridY + 1, gridX + 1, gridY + 2, _lightGreen);
screen->drawLine(gridX + 2, gridY, gridX + 2, gridY + 3, _lightGreen);
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/items/biochips/opticalchip.cpp b/engines/pegasus/items/biochips/opticalchip.cpp
index 3efe21a..888270d 100644
--- a/engines/pegasus/items/biochips/opticalchip.cpp
+++ b/engines/pegasus/items/biochips/opticalchip.cpp
@@ -135,6 +135,8 @@ void OpticalChip::playOpMemMovie(HotSpotID id) {
case kPoseidonSpotID:
movieName = "Images/AI/Globals/OMPI";
break;
+ default:
+ break;
}
ItemState state = getItemState(), newState;
diff --git a/engines/pegasus/items/biochips/pegasuschip.cpp b/engines/pegasus/items/biochips/pegasuschip.cpp
index 574316b..ff8b879 100644
--- a/engines/pegasus/items/biochips/pegasuschip.cpp
+++ b/engines/pegasus/items/biochips/pegasuschip.cpp
@@ -89,6 +89,8 @@ void PegasusChip::setUpPegasusChip() {
else
setItemState(kPegasusNorad10);
break;
+ default:
+ break;
}
}
@@ -112,6 +114,8 @@ void PegasusChip::setUpPegasusChipRude() {
if (GameState.getNoradFinished())
setItemState(kPegasusNorad00);
break;
+ default:
+ break;
}
}
@@ -130,6 +134,8 @@ void PegasusChip::activatePegasusHotspots() {
case kNoradDeltaID:
_recallSpot.setActive();
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/items/inventory/airmask.cpp b/engines/pegasus/items/inventory/airmask.cpp
index 50fab70..3569fa1 100644
--- a/engines/pegasus/items/inventory/airmask.cpp
+++ b/engines/pegasus/items/inventory/airmask.cpp
@@ -175,6 +175,8 @@ void AirMask::refillAirMask() {
case kAirMaskLowOn:
setItemState(kAirMaskFullOn);
break;
+ default:
+ break;
}
if (_oxygenTimer.isFuseLit()) {
diff --git a/engines/pegasus/items/item.cpp b/engines/pegasus/items/item.cpp
index cf05fbb..a71ed19 100644
--- a/engines/pegasus/items/item.cpp
+++ b/engines/pegasus/items/item.cpp
@@ -91,6 +91,8 @@ Item::Item(const ItemID id, const NeighborhoodID neighborhood, const RoomID room
_itemInfo.infoRightStart -= 600 * kGapForGroup4;
_itemInfo.infoRightStop -= 600 * kGapForGroup4;
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp
index ede9873..5d48bcf 100644
--- a/engines/pegasus/menu.cpp
+++ b/engines/pegasus/menu.cpp
@@ -293,6 +293,8 @@ void MainMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
_quitButton.hide();
setLastCommand(kMenuCmdQuit);
break;
+ default:
+ break;
}
} else {
switch (_menuSelection) {
@@ -333,6 +335,8 @@ void MainMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
_quitButton.hide();
setLastCommand(kMenuCmdQuit);
break;
+ default:
+ break;
}
}
}
@@ -360,6 +364,8 @@ void MainMenu::updateDisplay() {
_largeSelect.show();
_smallSelect.hide();
break;
+ default:
+ break;
}
} else {
switch (_menuSelection) {
@@ -401,6 +407,8 @@ void MainMenu::updateDisplay() {
_smallSelect.show();
_largeSelect.hide();
break;
+ default:
+ break;
}
vm->resetIntroTimer();
@@ -522,6 +530,8 @@ void CreditsMenu::newMenuSelection(const int newSelection) {
_smallSelect.hide();
_largeSelect.show();
break;
+ default:
+ break;
}
_menuSelection = newSelection;
@@ -778,6 +788,8 @@ void DeathMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
_mainMenuButton.hide();
setLastCommand(kMenuCmdDeathMainMenuDemo);
break;
+ default:
+ break;
}
} else {
switch (_menuSelection) {
@@ -799,6 +811,8 @@ void DeathMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
_mainMenuButton.hide();
setLastCommand(kMenuCmdDeathMainMenu);
break;
+ default:
+ break;
}
}
}
@@ -824,6 +838,8 @@ void DeathMenu::updateDisplay() {
_smallSelect.show();
_largeSelect.hide();
break;
+ default:
+ break;
}
} else {
switch (_menuSelection) {
@@ -842,6 +858,8 @@ void DeathMenu::updateDisplay() {
_largeSelect.show();
_smallSelect.hide();
break;
+ default:
+ break;
}
}
}
@@ -917,6 +935,8 @@ void DeathMenu::drawAllScores() {
drawScore(GameState.getTotalScore(), kMaxTotalScore, scoreBounds, &numbers);
break;
+ default:
+ break;
}
}
@@ -1081,6 +1101,8 @@ void PauseMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
case kPauseMenuQuitToMainMenu:
_menuSelection = kPauseMenuAmbience;
break;
+ default:
+ break;
}
updateDisplay();
}
@@ -1103,6 +1125,8 @@ void PauseMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
case kPauseMenuAmbience:
_menuSelection = kPauseMenuQuitToMainMenu;
break;
+ default:
+ break;
}
updateDisplay();
}
@@ -1173,6 +1197,8 @@ void PauseMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
_quitButton.hide();
setLastCommand(kMenuCmdPauseQuit);
break;
+ default:
+ break;
}
}
@@ -1216,6 +1242,8 @@ void PauseMenu::updateDisplay() {
_smallSelect.show();
_largeSelect.hide();
break;
+ default:
+ break;
}
((PegasusEngine *)g_engine)->resetIntroTimer();
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 7a54363..b9a5055 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -383,6 +383,8 @@ TimeValue Caldoria::getViewTime(const RoomID room, const DirectionConstant direc
if (direction == kNorth && GameState.getCaldoriaRoofDoorOpen())
extraID = kCa48NorthExplosion;
break;
+ default:
+ break;
}
if (extraID == 0xffffffff)
@@ -488,6 +490,8 @@ void Caldoria::findSpotEntry(const RoomID room, const DirectionConstant directio
if (direction == kEast && GameState.getLastRoom() != kCaldoria42)
entry.clear();
break;
+ default:
+ break;
}
}
@@ -507,6 +511,8 @@ void Caldoria::startExitMovie(const ExitTable::Entry &exitEntry) {
if (GameState.getCurrentDirection() == kNorth)
closeCroppedMovie();
break;
+ default:
+ break;
}
Neighborhood::startExitMovie(exitEntry);
@@ -518,6 +524,8 @@ void Caldoria::startZoomMovie(const ZoomTable::Entry &zoomEntry) {
if (GameState.getCurrentDirection() == kNorth)
closeCroppedMovie();
break;
+ default:
+ break;
}
Neighborhood::startZoomMovie(zoomEntry);
@@ -558,6 +566,8 @@ void Caldoria::startTurnPush(const TurnDirection turnDirection, const TimeValue
if (_croppedMovie.isSurfaceValid())
closeCroppedMovie();
break;
+ default:
+ break;
}
Neighborhood::startTurnPush(turnDirection, newViewTime, destDirection);
@@ -617,6 +627,8 @@ int16 Caldoria::getStaticCompassAngle(const RoomID room, const DirectionConstant
case kCaldoria55:
result += kCaldoria55Angle;
break;
+ default:
+ break;
}
return result;
@@ -648,6 +660,8 @@ void Caldoria::getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMoveSp
case MakeRoomView(kCaldoria55, kNorth):
compassMove.makeTwoKnotFaderSpec(_navMovie.getScale(), exitEntry.movieStart, 315, exitEntry.movieEnd, 270);
break;
+ default:
+ break;
}
}
@@ -660,6 +674,8 @@ void Caldoria::getZoomCompassMove(const ZoomTable::Entry &zoomEntry, FaderMoveSp
compassMove.insertFaderKnot(zoomEntry.movieStart + 19 * kCaldoriaFrameDuration, -90);
compassMove.insertFaderKnot(zoomEntry.movieEnd, -90);
break;
+ default:
+ break;
}
}
@@ -725,6 +741,8 @@ void Caldoria::checkContinuePoint(const RoomID room, const DirectionConstant dir
case MakeRoomView(kCaldoria49, kNorth):
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -749,6 +767,8 @@ void Caldoria::arriveAt(const RoomID room, const DirectionConstant direction) {
if (GameState.getCaldoriaSinclairShot())
setCurrentAlternate(kAltCaldoriaSinclairDown);
break;
+ default:
+ break;
}
Neighborhood::arriveAt(room, direction);
@@ -842,6 +862,8 @@ void Caldoria::arriveAt(const RoomID room, const DirectionConstant direction) {
case kCaldoriaDeathRoom:
arriveAtCaldoriaDeath();
break;
+ default:
+ break;
}
checkSinclairShootsOS();
@@ -994,6 +1016,8 @@ void Caldoria::setUpRoofTop() {
setCurrentAlternate(kAltCaldoriaSinclairDown);
}
break;
+ default:
+ break;
}
}
@@ -1086,6 +1110,8 @@ void Caldoria::turnTo(const DirectionConstant direction) {
_vm->playEndMessage();
}
break;
+ default:
+ break;
}
checkSinclairShootsOS();
@@ -1243,6 +1269,8 @@ void Caldoria::receiveNotification(Notification *notification, const Notificatio
updateViewFrame();
makeContinuePoint();
break;
+ default:
+ break;
}
} else if ((flags & kSpotSoundCompletedFlag) != 0) {
switch (GameState.getCurrentRoom()) {
@@ -1262,6 +1290,8 @@ void Caldoria::receiveNotification(Notification *notification, const Notificatio
case kCaldoriaReplicator:
emptyOJGlass();
break;
+ default:
+ break;
}
} else if ((flags & kSinclairLoopDoneFlag) != 0) {
if (++_sinclairLoopCount == _numSinclairLoops) {
@@ -1272,6 +1302,8 @@ void Caldoria::receiveNotification(Notification *notification, const Notificatio
case kCaldoria54:
playDeathExtra(kCa54SouthDeath, kDeathShotBySinclair);
break;
+ default:
+ break;
}
} else {
_navMovie.stop();
@@ -1302,6 +1334,9 @@ InputBits Caldoria::getInputFilter() {
case kCaldoria48:
if (GameState.getCaldoriaDoorBombed())
result &= ~kFilterAllDirections;
+ break;
+ default:
+ break;
}
return result;
@@ -1353,6 +1388,8 @@ void Caldoria::activateHotspots() {
_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRoofElevator5);
}
break;
+ default:
+ break;
}
}
@@ -1541,6 +1578,8 @@ CanOpenDoorReason Caldoria::canOpenDoor(DoorTable::Entry &entry) {
if (GameState.getCurrentDirection() == kSouth && !_privateFlags.getFlag(kCaldoriaPrivateCanOpenElevatorDoorFlag))
return kCantOpenLocked;
break;
+ default:
+ break;
}
return Neighborhood::canOpenDoor(entry);
@@ -1561,6 +1600,8 @@ GameInteraction *Caldoria::makeInteraction(const InteractionID interactionID) {
return new CaldoriaMessages(this, kCaldoriaMessagesNotificationID, _vm);
case kCaldoriaMirrorInteractionID:
return new CaldoriaMirror(this);
+ default:
+ break;
}
return 0;
@@ -1594,6 +1635,8 @@ Hotspot *Caldoria::getItemScreenSpot(Item *item, DisplayElement *element) {
case kOrangeJuiceGlassFull:
destSpotID = kCaldoriaOrangeJuiceSpotID;
break;
+ default:
+ break;
}
if (destSpotID == kNoHotSpotID)
@@ -1614,6 +1657,8 @@ void Caldoria::pickedUpItem(Item *item) {
case kStunGun:
GameState.setCaldoriaGunAimed(false);
break;
+ default:
+ break;
}
}
@@ -1691,6 +1736,8 @@ void Caldoria::takeElevator(uint startFloor, uint endFloor) {
startExtraSequence(kCaldoriaGroundToRoof, kExtraCompletedFlag, false);
_croppedMovie.start();
break;
+ default:
+ break;
}
break;
case 4:
@@ -1720,6 +1767,8 @@ void Caldoria::takeElevator(uint startFloor, uint endFloor) {
startExtraSequence(kCaldoriaFourthToRoof, kExtraCompletedFlag, false);
_croppedMovie.start();
break;
+ default:
+ break;
}
break;
case 5:
@@ -1749,8 +1798,12 @@ void Caldoria::takeElevator(uint startFloor, uint endFloor) {
case 5:
// Do nothing.
break;
+ default:
+ break;
}
break;
+ default:
+ break;
};
}
@@ -1768,6 +1821,8 @@ void Caldoria::updateElevatorMovie() {
case kCaldoria45:
time = k5FloorTime;
break;
+ default:
+ break;
}
}
@@ -1848,6 +1903,8 @@ void Caldoria::checkSinclairShootsOS() {
playSpotSoundSync(kCaldoriaScreamingAfterIn, kCaldoriaScreamingAfterOut);
die(kDeathSinclairShotDelegate);
break;
+ default:
+ break;
}
}
@@ -1938,6 +1995,8 @@ uint Caldoria::getNumHints() {
case MakeRoomView(kCaldoria49, kNorth):
numHints = 1;
break;
+ default:
+ break;
}
}
@@ -1973,6 +2032,8 @@ Common::String Caldoria::getHintMovie(uint hintNum) {
#endif
case MakeRoomView(kCaldoria49, kNorth):
return "Images/AI/Caldoria/X49NB2";
+ default:
+ break;
}
}
@@ -1988,6 +2049,8 @@ void Caldoria::updateCursor(const Common::Point where, const Hotspot *cursorSpot
case kCaldoriaKioskSpotID:
_vm->_cursor->setCurrentFrameIndex(3);
return;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index edd8959..303bcc2 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -208,6 +208,8 @@ void Caldoria4DSystem::useIdleTime() {
case k4DDesert2ToMountain0:
_videoChoice = k4DMountainChoice;
break;
+ default:
+ break;
}
setSpritesMovie();
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
index 6ea12e4..5da18ab 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
@@ -1266,6 +1266,8 @@ void CaldoriaBomb::receiveNotification(Notification *notification, const Notific
GameState.setScoringDisarmedNuke(true);
_owner->loadAmbientLoops();
break;
+ default:
+ break;
}
} else if (notification == &_timerNotification) {
_grid.hide();
@@ -1428,9 +1430,13 @@ void CaldoriaBomb::handleInput(const Input &input, const Hotspot *hotspot) {
_owner->_navMovie.setVolume(((PegasusEngine *)g_engine)->getSoundFXLevel());
_owner->startExtraSequence(kCaldoria56BombStage7, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
}
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
index 86c9688..6ebc4f2 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
@@ -73,6 +73,8 @@ void CaldoriaMessages::receiveNotification(Notification *notification, const Not
case kCaBedroomMessage2:
play1Message(2);
break;
+ default:
+ break;
}
} else {
_messageCallBack.releaseCallBack();
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
index d07e565..d39e9a7 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
@@ -75,6 +75,8 @@ void CaldoriaMirror::activateHotspots() {
g_allHotspots.activateOneHotspot(kCaHairStyle3SpotID);
g_allHotspots.deactivateOneHotspot(kCaBathroomMirrorSpotID);
break;
+ default:
+ break;
}
}
@@ -94,6 +96,8 @@ void CaldoriaMirror::clickInHotspot(const Input &input, const Hotspot *spot) {
case kCaBathroomGeoWave:
_owner->startExtraSequence(kCaBathroomGeoWaveReturn, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
break;
case kCaHairStyle1SpotID:
@@ -128,6 +132,8 @@ void CaldoriaMirror::receiveNotification(Notification *, const NotificationFlags
GameState.setScoringFixedHair(true);
GameState.setCaldoriaDoneHygiene(true);
break;
+ default:
+ break;
}
allowInput(true);
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 6e3795d..a94301e 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -323,6 +323,8 @@ TimeValue Mars::getViewTime(const RoomID room, const DirectionConstant direction
extraID -= 4;
}
break;
+ default:
+ break;
}
if (extraID == 0xffffffff)
@@ -346,6 +348,8 @@ void Mars::getZoomEntry(const HotSpotID spotID, ZoomTable::Entry &entry) {
if (GameState.getCurrentDirection() == kSouth && GameState.isTakenItemID(kMarsCard))
extraID = kMars31SouthZoomOutNoCard;
break;
+ default:
+ break;
}
if (extraID != 0xffffffff) {
@@ -373,6 +377,8 @@ void Mars::findSpotEntry(const RoomID room, const DirectionConstant direction, S
else
GameState.setMarsSeenThermalScan(true);
break;
+ default:
+ break;
}
}
}
@@ -389,6 +395,8 @@ CanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) {
if (GameState.getMarsSeenRobotAtReactor() && !GameState.getMarsAvoidedReactorRobot())
_utilityFuse.stopFuse();
break;
+ default:
+ break;
}
return reason;
@@ -453,6 +461,8 @@ CanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) {
if (!GameState.getMarsMazeDoorPair3())
return kCantOpenLocked;
break;
+ default:
+ break;
}
return Neighborhood::canOpenDoor(entry);
@@ -496,6 +506,8 @@ void Mars::openDoor() {
return;
}
break;
+ default:
+ break;
}
Neighborhood::openDoor();
@@ -677,6 +689,8 @@ void Mars::closeDoorOffScreen(const RoomID room, const DirectionConstant directi
case kMarsMaze180:
playSpotSoundSync(kMarsMazeDoorCloseIn, kMarsMazeDoorCloseOut);
break;
+ default:
+ break;
}
}
@@ -766,6 +780,8 @@ int16 Mars::getStaticCompassAngle(const RoomID room, const DirectionConstant dir
case MakeRoomView(kMars58, kWest):
angle -= 90;
break;
+ default:
+ break;
}
return angle;
@@ -885,6 +901,7 @@ void Mars::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec &co
break;
default:
Neighborhood::getExtraCompassMove(entry, compassMove);
+ break;
}
}
@@ -1089,6 +1106,8 @@ void Mars::checkContinuePoint(const RoomID room, const DirectionConstant directi
if (GameState.getMarsAvoidedReactorRobot())
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -1138,6 +1157,8 @@ void Mars::timerExpired(const uint32 eventType) {
case kMaze184RobotLoopingEvent:
_interruptionFilter = kFilterNoInput;
break;
+ default:
+ break;
}
}
@@ -1208,6 +1229,8 @@ void Mars::arriveAt(const RoomID room, const DirectionConstant direction) {
else
setCurrentAlternate(kAltMarsNormal);
break;
+ default:
+ break;
}
Neighborhood::arriveAt(room, direction);
@@ -1452,8 +1475,12 @@ void Mars::arriveAt(const RoomID room, const DirectionConstant direction) {
case kMars46:
die(kDeathRunOverByPod);
break;
+ default:
+ break;
}
break;
+ default:
+ break;
}
checkAirMask();
@@ -1485,6 +1512,8 @@ void Mars::turnTo(const DirectionConstant direction) {
if (getCurrentActivation() == kActivateAirlockPressurized)
playSpotSoundSync(kMarsAirlockPressurizeIn, kMarsAirlockPressurizeOut);
break;
+ default:
+ break;
}
Neighborhood::turnTo(direction);
@@ -1599,6 +1628,8 @@ void Mars::turnTo(const DirectionConstant direction) {
case MakeRoomView(kMarsMaze184, kWest):
launchMaze184Robot();
break;
+ default:
+ break;
}
}
@@ -1644,6 +1675,8 @@ void Mars::activateHotspots() {
case kActivateReactorReadyForCrowBar:
_vm->getAllHotspots().activateOneHotspot(kMars57CantOpenPanelSpotID);
break;
+ default:
+ break;
}
break;
case MakeRoomView(kMarsRobotShuttle, kEast):
@@ -1826,6 +1859,8 @@ InputBits Mars::getInputFilter() {
if (_canyonChaseMovie.isMovieValid() && _canyonChaseMovie.isRunning())
result &= ~kFilterAllDirections;
break;
+ default:
+ break;
}
return result;
@@ -1893,6 +1928,8 @@ void Mars::takeItemFromRoom(Item *item) {
case kOpticalBiochip:
_privateFlags.setFlag(kMarsPrivateGotOpticalChipFlag, true);
break;
+ default:
+ break;
}
Neighborhood::takeItemFromRoom(item);
@@ -1954,6 +1991,8 @@ void Mars::pickedUpItem(Item *item) {
startExtraSequence(kMarsRobotHeadClose, kExtraCompletedFlag, kFilterNoInput);
}
break;
+ default:
+ break;
}
}
@@ -2361,6 +2400,8 @@ void Mars::receiveNotification(Notification *notification, const NotificationFla
case kMarsMaze184WestLoop:
die(kDeathGroundByMazebot);
break;
+ default:
+ break;
}
} else if ((flag & kTimeForCanyonChaseFlag) != 0) {
doCanyonChase();
@@ -3222,6 +3263,8 @@ void Mars::spaceChaseClick(const Input &input, const HotSpotID id) {
_lowerRightShuttleMovie.redrawMovieWorld();
GameState.setMarsReadyForShuttleTransport(true);
break;
+ default:
+ break;
}
} else {
playSpotSoundSync(kShuttleTractorLimitedIn, kShuttleTractorLimitedOut);
@@ -3236,6 +3279,8 @@ void Mars::spaceChaseClick(const Input &input, const HotSpotID id) {
_lowerRightShuttleMovie.redrawMovieWorld();
_neighborhoodNotification.setNotificationFlags(kTimeToTransportFlag, kTimeToTransportFlag);
break;
+ default:
+ break;
}
}
@@ -3489,6 +3534,8 @@ void Mars::doReactorGuess(int32 guess) {
case 4:
playSpotSoundSync(kColorMatchPurpleIn, kColorMatchPurpleOut);
break;
+ default:
+ break;
}
_nextGuess++;
@@ -3511,6 +3558,8 @@ void Mars::doReactorGuess(int32 guess) {
case 3:
playSpotSoundSync(kColorMatchThreeNodesIn, kColorMatchThreeNodesOut);
break;
+ default:
+ break;
}
_currentGuess[0] = -1;
@@ -3542,6 +3591,8 @@ void Mars::doReactorGuess(int32 guess) {
GameState.setScoringDisarmedCardBomb();
startExtraSequence(kMars57GameSolved, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
} else if (_guessHistory.getNumGuesses() >= 5) {
_vm->delayShell(2, 1);
@@ -3657,6 +3708,8 @@ uint Mars::getNumHints() {
}
}
break;
+ default:
+ break;
}
}
@@ -3729,6 +3782,8 @@ Common::String Mars::getHintMovie(uint hintNum) {
}
return "Images/AI/Globals/XGLOB3F";
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/mars/spacejunk.cpp b/engines/pegasus/neighborhood/mars/spacejunk.cpp
index 80914b4..5275388 100644
--- a/engines/pegasus/neighborhood/mars/spacejunk.cpp
+++ b/engines/pegasus/neighborhood/mars/spacejunk.cpp
@@ -167,6 +167,8 @@ void SpaceJunk::rebound(const TimeValue reboundTime) {
_bounceStop.x = 640 - kMaxBounceSize / 2 + 1;
_bounceStop.y = kMaxBounceSize / 2 + 1 + vm->getRandomNumber(kBounceTargetVRange - 1);
break;
+ default:
+ break;
}
_bounceSizeStart = bounds.width();
diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
index c593f73..0980240 100644
--- a/engines/pegasus/neighborhood/neighborhood.cpp
+++ b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -402,6 +402,8 @@ void Neighborhood::popActionQueue() {
case kDelayRequest:
_delayTimer.stop();
break;
+ default:
+ break;
}
serviceActionQueue();
@@ -434,6 +436,8 @@ void Neighborhood::serviceActionQueue() {
_interruptionFilter = topRequest.interruptionFilter;
_delayTimer.start();
break;
+ default:
+ break;
}
}
} else {
@@ -1073,6 +1077,8 @@ void Neighborhood::startTurnPush(const TurnDirection turnDirection, const TimeVa
case kTurnDown:
_turnPush.setSlideDirection(kSlideUpMask);
break;
+ default:
+ break;
}
_turnPush.show();
diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
index 7866385..bc78fd9 100644
--- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
@@ -256,6 +256,8 @@ void NoradAlphaFillingStation::dispenseGas() {
setSegmentState(kFSNIncompatibleStart, kFSNIncompatibleStop,
kFSIntakeWarningFinishedFlag, kNoState);
break;
+ default:
+ break;
}
else {
if (_dispenseItemID == kArgonCanister) {
@@ -288,6 +290,8 @@ void NoradAlphaFillingStation::dispenseGas() {
case kNitrogenCanister:
setStaticState(kFSNAttach, kWaitingForDispense);
break;
+ default:
+ break;
}
}
}
@@ -349,6 +353,8 @@ void NoradAlphaFillingStation::receiveNotification(Notification *, const Notific
case kFSNHiliteFinishedFlag:
NHighlightFinished();
break;
+ default:
+ break;
}
}
@@ -409,6 +415,8 @@ void NoradAlphaFillingStation::clickInHotspot(const Input &input, const Hotspot
case kNorad01NSpotID:
clickInN();
break;
+ default:
+ break;
}
}
@@ -427,6 +435,8 @@ void NoradAlphaFillingStation::activateHotspots() {
g_allHotspots.activateOneHotspot(kNorad01OSpotID);
g_allHotspots.activateOneHotspot(kNorad01NSpotID);
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
index d42d974..fd8d19e 100644
--- a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
@@ -218,6 +218,8 @@ GameInteraction *NoradAlpha::makeInteraction(const InteractionID interactionID)
return new NoradAlphaECRMonitor(this);
case kNoradFillingStationInteractionID:
return new NoradAlphaFillingStation(this);
+ default:
+ break;
}
return Norad::makeInteraction(interactionID);
@@ -299,6 +301,8 @@ void NoradAlpha::checkContinuePoint(const RoomID room, const DirectionConstant d
case MakeRoomView(kNorad21, kSouth):
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -327,6 +331,8 @@ void NoradAlpha::arriveAt(const RoomID room, const DirectionConstant direction)
case kNorad22:
arriveAtNorad22();
break;
+ default:
+ break;
}
}
@@ -377,6 +383,8 @@ void NoradAlpha::receiveNotification(Notification *notification, const Notificat
_interruptionFilter = kFilterAllInput;
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -395,6 +403,8 @@ void NoradAlpha::receiveNotification(Notification *notification, const Notificat
GameState.setCurrentRoom(kNorad21);
arriveAt(kNorad22, kSouth);
break;
+ default:
+ break;
}
}
@@ -554,6 +564,8 @@ void NoradAlpha::activateHotspots() {
if (GameState.isCurrentDoorOpen())
_vm->getAllHotspots().deactivateOneHotspot(kNorad21WestSpotID);
break;
+ default:
+ break;
}
}
@@ -624,6 +636,8 @@ Hotspot *NoradAlpha::getItemScreenSpot(Item *item, DisplayElement *element) {
return _vm->getAllHotspots().findHotspotByID(kN01ArgonCanisterSpotID);
case kNitrogenCanister:
return _vm->getAllHotspots().findHotspotByID(kN01NitrogenCanisterSpotID);
+ default:
+ break;
}
return Norad::getItemScreenSpot(item, element);
@@ -672,6 +686,8 @@ uint NoradAlpha::getNumHints() {
case MakeRoomView(kNorad22, kWest):
numHints = 1;
break;
+ default:
+ break;
}
}
@@ -707,12 +723,16 @@ Common::String NoradAlpha::getHintMovie(uint hintNum) {
return "Images/AI/Globals/XGLOB5C";
case 3:
return "Images/AI/Norad/XN01SH";
+ default:
+ break;
}
break;
case MakeRoomView(kNorad19West, kWest):
return "Images/AI/Norad/XN19NH";
case MakeRoomView(kNorad22, kWest):
return "Images/AI/Globals/XGLOB1C";
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
index 2c339bd..3735f6d 100644
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -107,6 +107,8 @@ void GlobeTracker::setTrackParameters(const Hotspot *trackSpot, GlobeTrackDirect
_globeMovie->setSegment(0, _globeMovie->getDuration());
_globeMovie->setFlags(0);
break;
+ default:
+ break;
}
}
@@ -183,6 +185,8 @@ void GlobeTracker::trackGlobeMovie() {
_downHighlight->show();
break;
+ default:
+ break;
}
}
@@ -204,6 +208,8 @@ void GlobeTracker::stopGlobeMovie() {
_downHighlight->hide();
_trackTime = tickCount() - kVerticalDuration;
break;
+ default:
+ break;
}
}
@@ -725,6 +731,8 @@ void GlobeGame::receiveNotification(Notification *notification, const Notificati
_owner->requestSpotSound(kFiftySecondsIn, kFiftySecondsOut,
kFilterNoInput, kSpotSoundCompletedFlag);
break;
+ default:
+ break;
}
// fall through
// FIXME: fall through intentional?
diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
index c01241d..96000d1 100644
--- a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
@@ -316,6 +316,8 @@ void NoradDelta::checkContinuePoint(const RoomID room, const DirectionConstant d
case MakeRoomView(kNorad79, kWest):
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -633,6 +635,8 @@ void NoradDelta::receiveNotification(Notification *notification, const Notificat
case kN60RobotDisappears:
recallToTSASuccess();
break;
+ default:
+ break;
}
_interruptionFilter = kFilterAllInput;
@@ -682,6 +686,8 @@ void NoradDelta::pickedUpItem(Item *item) {
startExtraSequence(kN60RobotDisappears, kExtraCompletedFlag, kFilterNoInput);
}
break;
+ default:
+ break;
}
Norad::pickedUpItem(item);
@@ -698,6 +704,8 @@ void NoradDelta::takeItemFromRoom(Item *item) {
case kOpticalBiochip:
_privateFlags.setFlag(kNoradPrivateGotOpticalChipFlag, true);
break;
+ default:
+ break;
}
Norad::takeItemFromRoom(item);
@@ -714,6 +722,8 @@ void NoradDelta::dropItemIntoRoom(Item *item, Hotspot *hotspot) {
case kRetinalScanBiochip:
_privateFlags.setFlag(kNoradPrivateGotRetScanChipFlag, false);
break;
+ default:
+ break;
}
Norad::dropItemIntoRoom(item, hotspot);
@@ -741,6 +751,8 @@ Hotspot *NoradDelta::getItemScreenSpot(Item *item, DisplayElement *element) {
else
id = kDelta60RobotRetinalBiochipSpotID;
break;
+ default:
+ break;
}
if (id != kNoHotSpotID)
@@ -783,6 +795,8 @@ uint NoradDelta::getNumHints() {
numHints = 2;
}
break;
+ default:
+ break;
}
}
@@ -826,6 +840,8 @@ Common::String NoradDelta::getHintMovie(uint hintNum) {
return "Images/AI/Globals/XGLOB1B";
return "Images/AI/Globals/XGLOB3B";
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.cpp b/engines/pegasus/neighborhood/norad/pressuredoor.cpp
index e41899f..9393c4f 100644
--- a/engines/pegasus/neighborhood/norad/pressuredoor.cpp
+++ b/engines/pegasus/neighborhood/norad/pressuredoor.cpp
@@ -343,6 +343,8 @@ void PressureDoor::receiveNotification(Notification *notification, const Notific
((NoradDelta *)owner)->playerBeatRobotWithDoor();
owner->requestDeleteCurrentInteraction();
break;
+ default:
+ break;
}
}
@@ -368,6 +370,8 @@ void PressureDoor::receiveNotification(Notification *notification, const Notific
if (!_playingAgainstRobot)
((Norad *)_owner)->doneWithPressureDoor();
break;
+ default:
+ break;
}
}
} else if (notification == &_pressureNotification) {
@@ -397,6 +401,8 @@ void PressureDoor::receiveNotification(Notification *notification, const Notific
_downButton.hide();
owner->startExtraSequence(kN59PlayerWins2, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
} else if (notification == &_utilityNotification) {
switch (flags) {
@@ -423,6 +429,8 @@ void PressureDoor::receiveNotification(Notification *notification, const Notific
_upButton.hide();
_downButton.hide();
break;
+ default:
+ break;
}
}
}
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
index f832f54..b7a39fd 100644
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
@@ -605,6 +605,8 @@ void SubControlRoom::receiveNotification(Notification *notification, const Notif
case kDeltaPrepFinished:
setControlMonitorToTime(kMainMenuTime * _subControlScale, kDeltaMainMenu, true);
break;
+ default:
+ break;
}
} else if (notification == &_greenBallNotification) {
if (_robotState == kRobotWon) {
@@ -667,6 +669,8 @@ void SubControlRoom::receiveNotification(Notification *notification, const Notif
g_system->delayMillis(2 * 1000); // 120 ticks
((PegasusEngine *)g_engine)->die(kDeathRobotSubControlRoom);
break;
+ default:
+ break;
}
} else {
if (_gameState == kPuttingClawAway && _nextAction == kNoActionIndex) {
@@ -690,6 +694,8 @@ void SubControlRoom::receiveNotification(Notification *notification, const Notif
case kClawAtD:
dispatchClawAction(kMoveRightActionIndex);
break;
+ default:
+ break;
}
}
} else {
@@ -825,6 +831,8 @@ void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) {
case kClawAtD:
dispatchClawAction(kMoveRightActionIndex);
break;
+ default:
+ break;
}
}
}
@@ -884,6 +892,8 @@ void SubControlRoom::performActionImmediately(const int action, const uint32 ext
// Start move.
_greenBallTimer.start();
break;
+ default:
+ break;
}
if (_playingAgainstRobot) {
@@ -897,6 +907,8 @@ void SubControlRoom::performActionImmediately(const int action, const uint32 ext
case kCarriedToDoor:
owner->startExtraSequence(kN60ArmCarriesRobotToPositionA, kExtraCompletedFlag, kFilterAllInput);
break;
+ default:
+ break;
}
} else {
owner->startExtraSequence(extraID, kExtraCompletedFlag, kFilterAllInput);
@@ -967,6 +979,8 @@ void SubControlRoom::updateClawMonitor() {
case kClawAtD:
setClawMonitorToTime(kClawAtDTime);
break;
+ default:
+ break;
}
}
@@ -1145,6 +1159,8 @@ void SubControlRoom::moveGreenBallToC() {
case kClawAtD:
_greenBall.setCurrentFrameIndex(kGreenBallAtCArmAtD);
break;
+ default:
+ break;
}
_greenBall.moveElementTo(kNoradGreenBallAtCLeft, kNoradGreenBallAtCTop);
diff --git a/engines/pegasus/neighborhood/norad/subplatform.cpp b/engines/pegasus/neighborhood/norad/subplatform.cpp
index 34836e3..16b8ad6 100644
--- a/engines/pegasus/neighborhood/norad/subplatform.cpp
+++ b/engines/pegasus/neighborhood/norad/subplatform.cpp
@@ -127,6 +127,7 @@ void SubPlatform::receiveNotification(Notification *notification, const Notifica
break;
case kSubDamaged:
// Shouldn't happen.
+ default:
break;
}
break;
@@ -161,6 +162,8 @@ void SubPlatform::receiveNotification(Notification *notification, const Notifica
_stateBits |= kWaitingForPlayerBit;
allowInput(true);
break;
+ default:
+ break;
}
} else if (notification == _neighborhoodNotification) {
allowInput(true);
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
index 9f8f698..5911f62 100644
--- a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
+++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
@@ -191,6 +191,8 @@ TimeValue Prehistoric::getViewTime(const RoomID room, const DirectionConstant di
extraID = kPre25EastViewNoLog;
}
break;
+ default:
+ break;
}
if (extraID == 0xffffffff)
@@ -221,6 +223,8 @@ void Prehistoric::findSpotEntry(const RoomID room, const DirectionConstant direc
else
GameState.setPrehistoricSeenFlyer2(true);
break;
+ default:
+ break;
}
}
@@ -261,6 +265,8 @@ void Prehistoric::getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMov
compassMove.insertFaderKnot(exitEntry.movieStart + kPrehistoricFrameDuration * 32, angle - 90);
compassMove.insertFaderKnot(exitEntry.movieEnd, angle - 90);
break;
+ default:
+ break;
}
}
@@ -304,6 +310,8 @@ void Prehistoric::turnTo(const DirectionConstant newDirection) {
playSpotSoundSync(kPrehistoricFlashlightClickIn, kPrehistoricFlashlightClickOut);
}
break;
+ default:
+ break;
}
}
@@ -321,6 +329,8 @@ void Prehistoric::checkContinuePoint(const RoomID room, const DirectionConstant
case MakeRoomView(kPrehistoric25, kNorth):
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -397,6 +407,8 @@ void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction)
case MakeRoomView(kPrehistoric25, kEast):
setCurrentActivation(kActivationVaultClosed);
break;
+ default:
+ break;
}
}
@@ -457,6 +469,8 @@ void Prehistoric::loadAmbientLoops() {
// 0 volume.
loadLoopSound1("");
break;
+ default:
+ break;
}
switch (room) {
@@ -508,6 +522,8 @@ void Prehistoric::loadAmbientLoops() {
else
loadLoopSound2("Sounds/Prehistoric/P24NAL00.22k.AIFF", 64);
break;
+ default:
+ break;
}
}
@@ -522,6 +538,8 @@ void Prehistoric::activateHotspots() {
case MakeRoomView(kPrehistoric22North, kNorth):
_vm->getAllHotspots().activateOneHotspot(kPre22NorthBreakerSpotID);
break;
+ default:
+ break;
}
}
@@ -580,6 +598,8 @@ void Prehistoric::receiveNotification(Notification *notification, const Notifica
case kPre25EastUnlockingVaultWithLog:
_vm->addItemToInventory((InventoryItem *)_vm->getAllItems().findItemByID(kJourneymanKey));
break;
+ default:
+ break;
}
}
@@ -605,6 +625,8 @@ Common::String Prehistoric::getEnvScanMovie() {
case kPrehistoric23:
case kPrehistoric24:
return "Images/AI/Prehistoric/XP7WB";
+ default:
+ break;
}
}
@@ -628,6 +650,8 @@ uint Prehistoric::getNumHints() {
if (!_privateFlags.getFlag(kPrehistoricPrivateVaultOpenFlag))
numHints = 1;
break;
+ default:
+ break;
}
}
@@ -643,6 +667,8 @@ Common::String Prehistoric::getHintMovie(uint hintNum) {
return "Images/AI/Prehistoric/XP18WD";
case MakeRoomView(kPrehistoric25, kEast):
return "Images/AI/Globals/XGLOB1A";
+ default:
+ break;
}
}
@@ -673,6 +699,8 @@ void Prehistoric::pickedUpItem(Item *item) {
case kHistoricalLog:
GameState.setScoringGotHistoricalLog(true);
break;
+ default:
+ break;
}
Neighborhood::pickedUpItem(item);
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index b6b8b13..7dcb58a 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -832,6 +832,8 @@ uint FullTSA::getNumHints() {
if (GameState.getCurrentRoom() == kTSA0B && GameState.getTSA0BZoomedIn())
numHints = 3;
break;
+ default:
+ break;
}
}
@@ -947,6 +949,8 @@ short FullTSA::getStaticCompassAngle(const RoomID room, const DirectionConstant
case kTSA37:
result -= kCompassShift * 2;
break;
+ default:
+ break;
}
return result;
@@ -984,6 +988,8 @@ void FullTSA::getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMoveSpe
compassMove.insertFaderKnot(exitEntry.movieStart + kFullTSAFrameDuration * 105,
getStaticCompassAngle(exitEntry.exitRoom, exitEntry.exitDirection));
break;
+ default:
+ break;
}
}
@@ -1092,6 +1098,8 @@ TimeValue FullTSA::getViewTime(const RoomID room, const DirectionConstant direct
break;
}
break;
+ default:
+ break;
}
if (extraID != 0xffffffff) {
@@ -1136,6 +1144,8 @@ void FullTSA::pickedUpItem(Item *item) {
_vm->addItemToBiochips(biochip);
GameState.setScoringGotPegasusBiochip(true);
break;
+ default:
+ break;
}
}
@@ -1203,6 +1213,8 @@ void FullTSA::startDoorOpenMovie(const TimeValue startTime, const TimeValue stop
return;
}
break;
+ default:
+ break;
}
Neighborhood::startDoorOpenMovie(startTime, stopTime);
@@ -1221,6 +1233,8 @@ InputBits FullTSA::getInputFilter() {
// Can't move forward in Pegasus. Only press the exit button.
result &= ~(kFilterUpButton | kFilterUpAuto);
break;
+ default:
+ break;
}
return result;
@@ -1240,6 +1254,8 @@ void FullTSA::turnLeft() {
case MakeRoomView(kTSA0B, kEast):
shutDownComparisonMonitor();
break;
+ default:
+ break;
}
Neighborhood::turnLeft();
@@ -1259,6 +1275,8 @@ void FullTSA::turnRight() {
case MakeRoomView(kTSA0B, kEast):
shutDownComparisonMonitor();
break;
+ default:
+ break;
}
Neighborhood::turnRight();
@@ -1270,6 +1288,8 @@ void FullTSA::openDoor() {
if (GameState.getTSAState() == kTSAPlayerNeedsHistoricalLog || GameState.getTSAState() == kRobotsAtFrontDoor)
setCurrentAlternate(kAltTSARedAlert);
break;
+ default:
+ break;
}
Neighborhood::openDoor();
@@ -1296,6 +1316,8 @@ CanOpenDoorReason FullTSA::canOpenDoor(DoorTable::Entry &entry) {
if (GameState.getTSACommandCenterLocked())
return kCantOpenLocked;
break;
+ default:
+ break;
}
return Neighborhood::canOpenDoor(entry);
@@ -1322,6 +1344,7 @@ void FullTSA::downButton(const Input &input) {
break;
default:
Neighborhood::downButton(input);
+ break;
}
}
@@ -1370,6 +1393,8 @@ void FullTSA::activateHotspots() {
_vm->getAllHotspots().activateOneHotspot(kTSA0BEastCompareWSCSpotID);
}
break;
+ default:
+ break;
}
break;
case MakeRoomView(kTSA0B, kNorth):
@@ -1382,8 +1407,12 @@ void FullTSA::activateHotspots() {
_vm->getAllHotspots().activateOneHotspot(kTSA0BNorthRobotsToReadyRoomSpotID);
_vm->getAllHotspots().activateOneHotspot(kTSA0BNorthRobotsToFrontDoorSpotID);
break;
+ default:
+ break;
}
break;
+ default:
+ break;
}
}
@@ -1518,6 +1547,8 @@ void FullTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
_sprite2.setCurrentFrameIndex(kRedirectionNewTargetSprite);
startExtraSequence(kTSA0BRobotsFromReadyRoomToCommandCenter, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
break;
case kTSA0BNorthRobotsToReadyRoomSpotID:
@@ -1540,6 +1571,8 @@ void FullTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
case kRobotsAtReadyRoom:
// Nothing
break;
+ default:
+ break;
}
break;
case kTSA0BNorthRobotsToFrontDoorSpotID:
@@ -1562,6 +1595,8 @@ void FullTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
_sprite2.setCurrentFrameIndex(kRedirectionNewTargetSprite);
startExtraSequence(kTSA0BRobotsFromReadyRoomToFrontDoor, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
break;
@@ -1954,6 +1989,8 @@ void FullTSA::startUpRobotMonitor() {
case kRobotsAtReadyRoom:
showExtraView(kTSA0BNorthRobotsAtRRView);
break;
+ default:
+ break;
}
}
@@ -1990,6 +2027,8 @@ void FullTSA::checkContinuePoint(const RoomID room, const DirectionConstant dire
case MakeRoomView(kTSA26, kNorth):
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -2049,6 +2088,8 @@ void FullTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
case kRobotsAtReadyRoom:
startUpRobotMonitor();
break;
+ default:
+ break;
}
} else {
setCurrentActivation(kActivateTSA0BZoomedOut);
@@ -2064,6 +2105,8 @@ void FullTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
case kTSAPlayerGotHistoricalLog:
startExtraSequence(kTSA0BNorthHistLogOpen, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
}
break;
@@ -2091,6 +2134,8 @@ void FullTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
case kRobotsAtReadyRoom:
initializeComparisonMonitor(kMonitorNeutral, 0);
break;
+ default:
+ break;
}
} else {
setCurrentActivation(kActivateTSA0BZoomedOut);
@@ -2118,6 +2163,8 @@ void FullTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
case MakeRoomView(kTSA37, kNorth):
arriveAtTSA37();
break;
+ default:
+ break;
}
}
@@ -2144,6 +2191,8 @@ void FullTSA::checkRobotLocations(const RoomID room, const DirectionConstant dir
case kRobotsAtReadyRoom:
setCurrentAlternate(kAltTSARobotsAtReadyRoom);
break;
+ default:
+ break;
}
break;
case kTSA16:
@@ -2161,9 +2210,13 @@ void FullTSA::checkRobotLocations(const RoomID room, const DirectionConstant dir
case kRobotsAtReadyRoom:
setCurrentAlternate(kAltTSARobotsAtReadyRoom);
break;
+ default:
+ break;
}
}
break;
+ default:
+ break;
}
}
@@ -2208,6 +2261,8 @@ void FullTSA::arriveAtTSA37() {
case kPlayerFinishedWithTSA:
initializePegasusButtons(true);
break;
+ default:
+ break;
}
}
@@ -2245,6 +2300,8 @@ void FullTSA::turnTo(const DirectionConstant newDirection) {
if (GameState.getTSA0BZoomedIn())
startUpComparisonMonitor();
break;
+ default:
+ break;
}
break;
case MakeRoomView(kTSA0B, kNorth):
@@ -2281,6 +2338,8 @@ void FullTSA::turnTo(const DirectionConstant newDirection) {
if (GameState.getTSA0BZoomedIn())
startExtraSequence(kTSA0BShowGuardRobots, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
break;
case MakeRoomView(kTSA0B, kWest):
@@ -2315,6 +2374,8 @@ void FullTSA::turnTo(const DirectionConstant newDirection) {
case kRobotsAtReadyRoom:
setCurrentAlternate(kAltTSARobotsAtReadyRoom);
break;
+ default:
+ break;
}
break;
case MakeRoomView(kTSA22Red, kEast):
@@ -2343,6 +2404,8 @@ void FullTSA::turnTo(const DirectionConstant newDirection) {
setCurrentActivation(kActivateHotSpotAlways);
break;
+ default:
+ break;
}
// Make sure the TBP monitor is forced neutral.
@@ -2371,6 +2434,8 @@ void FullTSA::closeDoorOffScreen(const RoomID room, const DirectionConstant) {
case kTSA37:
playSpotSoundSync(kTSAPegasusDoorCloseIn, kTSAPegasusDoorCloseOut);
break;
+ default:
+ break;
}
}
@@ -2385,6 +2450,8 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
// which may end up starting another sequence...
turnTo(kNorth);
break;
+ default:
+ break;
}
}
@@ -2459,6 +2526,8 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
case kRobotsAtReadyRoom:
startUpComparisonMonitor();
break;
+ default:
+ break;
}
break;
case kTSA0BEastZoomOut:
@@ -2520,6 +2589,8 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
case kRobotsAtReadyRoom:
startExtraSequence(kTSA0BShowGuardRobots, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
break;
case kTSA0BNorthZoomOut:
@@ -2687,6 +2758,8 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
GameState.setWSCRobotDead(false);
GameState.setWSCRobotGone(false);
break;
+ default:
+ break;
};
break;
case kTSA37TimeJumpToPegasus:
@@ -2722,6 +2795,8 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
case kPlayerOnWayToWSC:
g_opticalChip->playOpMemMovie(kMercurySpotID);
break;
+ default:
+ break;
}
}
@@ -2766,6 +2841,8 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
GameState.setTSAState(kPlayerFinishedWithTSA);
initializePegasusButtons(true);
break;
+ default:
+ break;
}
}
@@ -2847,6 +2924,8 @@ Hotspot *FullTSA::getItemScreenSpot(Item *item, DisplayElement *element) {
case kPegasusBiochip:
return _vm->getAllHotspots().findHotspotByID(kTSA23WestChipsSpotID);
break;
+ default:
+ break;
}
return Neighborhood::getItemScreenSpot(item, element);
@@ -2869,6 +2948,8 @@ void FullTSA::dropItemIntoRoom(Item *item, Hotspot *dropSpot) {
GameState.setScoringPutLogInReader(true);
}
break;
+ default:
+ break;
}
}
@@ -2938,6 +3019,8 @@ void FullTSA::handleInput(const Input &input, const Hotspot *cursorSpot) {
_sprite2.hide();
}
break;
+ default:
+ break;
}
}
break;
@@ -2969,9 +3052,13 @@ void FullTSA::handleInput(const Input &input, const Hotspot *cursorSpot) {
_sprite1.hide();
}
break;
+ default:
+ break;
}
}
break;
+ default:
+ break;
}
Neighborhood::handleInput(input, cursorSpot);
@@ -3016,6 +3103,8 @@ void FullTSA::doSolve() {
_sprite2.setCurrentFrameIndex(kRedirectionNewTargetSprite);
startExtraSequence(kTSA0BRobotsFromReadyRoomToFrontDoor, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
}
@@ -3034,6 +3123,8 @@ void FullTSA::updateCursor(const Common::Point where, const Hotspot *cursorSpot)
case kTSA0BWestMonitorOutSpotID:
_vm->_cursor->setCurrentFrameIndex(2);
return;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index 33ef106..ce0e5cf 100644
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -251,6 +251,8 @@ void TinyTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
requestExtraSequence(kTinyTSA37WSCToDepart, 0, kFilterNoInput);
requestExtraSequence(kTinyTSA37PegasusDepart, kExtraCompletedFlag, kFilterNoInput);
return;
+ default:
+ break;
}
}
@@ -287,6 +289,8 @@ void TinyTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
case kPlayerLockedInPegasus:
showMainJumpMenu();
break;
+ default:
+ break;
}
}
@@ -362,6 +366,8 @@ void TinyTSA::receiveNotification(Notification *notification, const Notification
GameState.setWSCRobotDead(false);
GameState.setWSCRobotGone(false);
break;
+ default:
+ break;
};
break;
case kTinyTSA37TimeJumpToPegasus:
@@ -394,6 +400,8 @@ void TinyTSA::receiveNotification(Notification *notification, const Notification
case kPlayerOnWayToWSC:
g_opticalChip->playOpMemMovie(kMercurySpotID);
break;
+ default:
+ break;
}
}
@@ -419,6 +427,8 @@ void TinyTSA::receiveNotification(Notification *notification, const Notification
case kTinyTSA37CancelWSC:
showMainJumpMenu();
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index 02336c0..9b67db5 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -740,6 +740,8 @@ uint WSC::getNumHints() {
if (getCurrentActivation() == kActivationRobotTurning)
return 1;
break;
+ default:
+ break;
}
return 0;
@@ -796,6 +798,8 @@ Common::String WSC::getHintMovie(uint hintNum) {
// Only get here if the door is still locked and we don't have the
// crowbar...
return "Images/AI/WSC/XW59SD2";
+ default:
+ break;
}
break;
case MakeRoomView(kWSC03, kNorth):
@@ -838,6 +842,8 @@ Common::String WSC::getHintMovie(uint hintNum) {
return "Images/AI/Globals/XGLOB1C";
case MakeRoomView(kWSC98, kWest):
return "Images/AI/WSC/XW98WH2";
+ default:
+ break;
}
return "";
@@ -942,6 +948,8 @@ TimeValue WSC::getViewTime(const RoomID room, const DirectionConstant direction)
}
}
break;
+ default:
+ break;
}
if (viewExtra != 0xffffffff) {
@@ -961,6 +969,8 @@ void WSC::findSpotEntry(const RoomID room, const DirectionConstant direction, Sp
return;
}
break;
+ default:
+ break;
}
Neighborhood::findSpotEntry(room, direction, flags, spotEntry);
@@ -997,6 +1007,8 @@ void WSC::getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry) {
if (GameState.isTakenItemID(kMachineGun))
zoomExtra = kW61SouthZoomOutNoGun;
break;
+ default:
+ break;
}
if (zoomExtra != 0xffffffff) {
@@ -1077,6 +1089,8 @@ CanTurnReason WSC::canTurn(TurnDirection turnDirection, DirectionConstant &nextD
if (_privateFlags.getFlag(kWSCPrivateInMoleculeGameFlag))
return kCantTurnInMoleculeGame;
break;
+ default:
+ break;
}
return Neighborhood::canTurn(turnDirection, nextDir);
@@ -1092,6 +1106,8 @@ CanOpenDoorReason WSC::canOpenDoor(DoorTable::Entry &entry) {
if (!_privateFlags.getFlag(kWSCPrivate58SouthOpenFlag))
return kCantOpenLocked;
break;
+ default:
+ break;
}
return Neighborhood::canOpenDoor(entry);
@@ -1208,6 +1224,8 @@ void WSC::doorOpened() {
GameState.setScoringOpenedCatwalk();
scheduleEvent(kGawkAtRobotTime, 1, kTimerEventPlayerGawkingAtRobot);
break;
+ default:
+ break;
}
}
@@ -1232,6 +1250,8 @@ void WSC::turnLeft() {
case MakeRoomView(kWSC95, kWest):
cancelEvent();
break;
+ default:
+ break;
}
Neighborhood::turnLeft();
@@ -1258,6 +1278,8 @@ void WSC::turnRight() {
case MakeRoomView(kWSC95, kWest):
cancelEvent();
break;
+ default:
+ break;
}
Neighborhood::turnRight();
@@ -1272,6 +1294,8 @@ void WSC::moveForward() {
case MakeRoomView(kWSC95, kWest):
cancelEvent();
break;
+ default:
+ break;
}
Neighborhood::moveForward();
@@ -1306,6 +1330,8 @@ void WSC::zoomTo(const Hotspot *hotspot) {
return;
}
break;
+ default:
+ break;
}
Neighborhood::zoomTo(hotspot);
@@ -1357,6 +1383,8 @@ int16 WSC::getStaticCompassAngle(const RoomID room, const DirectionConstant dir)
if (dir == kEast || dir == kWest)
angle += kAuditoriumAngleOffset * 4;
break;
+ default:
+ break;
}
return angle;
@@ -1446,6 +1474,8 @@ void WSC::checkContinuePoint(const RoomID room, const DirectionConstant directio
if (_vm->playerHasItemID(kMachineGun))
makeContinuePoint();
break;
+ default:
+ break;
}
}
@@ -1488,6 +1518,8 @@ void WSC::arriveAt(const RoomID room, const DirectionConstant dir) {
if (!GameState.getWSCBeenAtWSC93())
setCurrentAlternate(kAltWSCW0ZDoorOpen);
break;
+ default:
+ break;
}
Neighborhood::arriveAt(room, dir);
@@ -1608,6 +1640,8 @@ void WSC::arriveAt(const RoomID room, const DirectionConstant dir) {
case MakeRoomView(kWSCDeathRoom, kWest):
die(kDeathArrestedInWSC);
break;
+ default:
+ break;
}
checkPeopleCrossing();
@@ -1665,6 +1699,8 @@ void WSC::turnTo(const DirectionConstant direction) {
if (getCurrentAlternate() == kAltWSCW0ZDoorOpen)
startExtraSequence(kW0ZSpottedByWomen, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
checkPeopleCrossing();
@@ -1962,6 +1998,8 @@ void WSC::receiveNotification(Notification *notification, const NotificationFlag
_privateFlags.setFlag(kWSCPrivateRobotHeadOpenFlag, false);
GameState.setWSCRobotGone(true);
break;
+ default:
+ break;
}
}
@@ -1981,6 +2019,8 @@ void WSC::timerExpired(const uint32 event) {
case kTimerEventPlayerGawkingAtRobot2:
startExtraSequence(kW98MorphsToRobot, kExtraCompletedFlag, kFilterAllInput);
break;
+ default:
+ break;
}
}
@@ -2026,6 +2066,8 @@ void WSC::startMoleculeGameLevel() {
case 3:
playSpotSoundSync(kWSCMolecule3In, kWSCMolecule3Out);
break;
+ default:
+ break;
}
_moleculesMovie.start();
@@ -2072,6 +2114,8 @@ void WSC::moleculeGameClick(const HotSpotID id) {
_moleculeBin.cleanUpMoleculeBin();
requestExtraSequence(kW03NorthFinishSynthesis, kExtraCompletedFlag, kFilterNoInput);
break;
+ default:
+ break;
}
} else {
_moleculesMovie.setFlags(kLoopTimeBase);
@@ -2147,6 +2191,8 @@ void WSC::activateOneHotspot(HotspotInfoTable::Entry &entry, Hotspot *hotspot) {
if (argonCanister->getItemState() != kArgonFull)
hotspot->setInactive();
break;
+ default:
+ break;
}
}
@@ -2426,6 +2472,8 @@ void WSC::pickedUpItem(Item *item) {
recallToTSASuccess();
break;
+ default:
+ break;
}
}
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index a1aa5be..78991cd 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -2480,6 +2480,8 @@ uint PegasusEngine::getNeighborhoodCD(const NeighborhoodID neighborhood) const {
// Tiny TSA exists on three of the CD's, so just continue
// with the CD we're on
return _currentCD;
+ default:
+ break;
}
// Can't really happen, but it's a good fallback anyway :P
More information about the Scummvm-git-logs
mailing list