[Scummvm-git-logs] scummvm master -> 1072fca204c17fbd15cd6fbfc388ba300c0dcd03
digitall
547637+digitall at users.noreply.github.com
Mon Dec 2 00:21:16 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:
1072fca204 MOHAWK: Fix Missing Default Switch Cases
Commit: 1072fca204c17fbd15cd6fbfc388ba300c0dcd03
https://github.com/scummvm/scummvm/commit/1072fca204c17fbd15cd6fbfc388ba300c0dcd03
Author: D G Turner (digitall at scummvm.org)
Date: 2019-12-02T00:16:10Z
Commit Message:
MOHAWK: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Changed paths:
engines/mohawk/cstime.cpp
engines/mohawk/cstime_cases.cpp
engines/mohawk/cstime_game.cpp
engines/mohawk/cstime_ui.cpp
engines/mohawk/livingbooks.cpp
engines/mohawk/livingbooks_code.cpp
engines/mohawk/livingbooks_code.h
engines/mohawk/myst_graphics.cpp
engines/mohawk/myst_stacks/myst.cpp
engines/mohawk/myst_stacks/selenitic.cpp
engines/mohawk/riven_stacks/gspit.cpp
diff --git a/engines/mohawk/cstime.cpp b/engines/mohawk/cstime.cpp
index 27d646f..89044eb 100644
--- a/engines/mohawk/cstime.cpp
+++ b/engines/mohawk/cstime.cpp
@@ -113,6 +113,9 @@ Common::Error MohawkEngine_CSTime::run() {
case kCSTStateNormal:
update();
break;
+
+ default:
+ break;
}
}
diff --git a/engines/mohawk/cstime_cases.cpp b/engines/mohawk/cstime_cases.cpp
index 722d82a..c619b96 100644
--- a/engines/mohawk/cstime_cases.cpp
+++ b/engines/mohawk/cstime_cases.cpp
@@ -49,6 +49,8 @@ bool CSTimeCase1::checkConvCondition(uint16 conditionId) {
case 2:
// Is the bag on the boat, but player hasn't taken the torch?
return (hotspots[5].state != 1 && !gotTorch);
+ default:
+ break;
}
return false;
@@ -73,6 +75,8 @@ bool CSTimeCase1::checkObjectCondition(uint16 objectId) {
case 3:
// Hide torch if it's been picked up.
return (hotspots[4].state == 1);
+ default:
+ break;
}
break;
@@ -102,6 +106,10 @@ bool CSTimeCase1::checkObjectCondition(uint16 objectId) {
// The third note piece.
if (objectId == 1)
return !_vm->getInterface()->getCarmenNote()->havePiece(2);
+ break;
+
+ default:
+ break;
}
return true;
@@ -340,6 +348,9 @@ void CSTimeCase1::handleConditionalEvent(const CSTimeEvent &event) {
else
incorrectBodySequence(3, 14562, event.param1);
break;
+
+ default:
+ break;
}
_vm->insertEventAtFront(CSTimeEvent(kCSTimeEventDisableFeature, 0xffff, event.param1));
diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index c939d8b..4f9e398 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -1030,6 +1030,8 @@ void CSTimeScene::mouseMove(Common::Point &pos) {
case 11:
_vm->getInterface()->cursorSetShape(10);
break;
+ default:
+ break;
}
}
diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp
index 59be95a..c4bbc7e 100644
--- a/engines/mohawk/cstime_ui.cpp
+++ b/engines/mohawk/cstime_ui.cpp
@@ -265,6 +265,8 @@ void CSTimeInterface::mouseDown(Common::Point pos) {
case 13:
cursorChangeShape(14);
break;
+ default:
+ break;
}
if (_book->getState() == 2) {
@@ -442,6 +444,8 @@ void CSTimeInterface::mouseUp(Common::Point pos) {
case 14:
cursorChangeShape(13);
break;
+ default:
+ break;
}
if (_vm->getCase()->getCurrScene()->eventIsActive()) {
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index eeadde1..b159bbe 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -602,6 +602,9 @@ void MohawkEngine_LivingBooks::updatePage() {
if (item)
item->setVisible(false);
break;
+
+ default:
+ break;
}
}
_phase++;
@@ -629,6 +632,9 @@ void MohawkEngine_LivingBooks::updatePage() {
_phase++;
break;
+
+ default:
+ break;
}
while (_eventQueue.size()) {
@@ -653,6 +659,8 @@ void MohawkEngine_LivingBooks::updatePage() {
case kLBDelayedEventDone:
_items[i]->done(true);
break;
+ default:
+ break;
}
break;
@@ -1221,6 +1229,9 @@ void MohawkEngine_LivingBooks::handleUIQuitClick(uint controlId) {
if (!tryLoadPageStart(kLBControlMode, 1))
error("couldn't return to menu");
break;
+
+ default:
+ break;
}
}
@@ -1293,6 +1304,9 @@ void MohawkEngine_LivingBooks::handleUIOptionsClick(uint controlId) {
if (!tryLoadPageStart(kLBPlayMode, _curSelectedPage))
error("failed to load page %d", _curSelectedPage);
break;
+
+ default:
+ break;
}
}
@@ -1337,6 +1351,9 @@ void MohawkEngine_LivingBooks::handleNotify(NotifyEvent &event) {
// options screen
handleUIOptionsClick(event.param);
break;
+
+ default:
+ break;
}
break;
@@ -1586,6 +1603,8 @@ NodeState LBAnimationNode::update(bool seeking) {
// TODO
_vm->_sound->stopSound(soundResourceId);
break;
+ default:
+ break;
}
}
break;
@@ -2685,6 +2704,8 @@ void LBItem::startPhase(uint phase) {
setNextTime(_periodMin, _periodMax);
}
break;
+ default:
+ break;
}
}
@@ -2836,6 +2857,8 @@ int LBItem::runScriptEntry(LBScriptEntry *entry) {
// Loop.
entry->state = 0;
break;
+ default:
+ break;
}
}
count = 1;
@@ -3061,6 +3084,8 @@ int LBItem::runScriptEntry(LBScriptEntry *entry) {
debug(2, "JumpToExpression got %d (on %d, of %d)", e, i, entry->subentries.size());
i = e - 1;
break;
+ default:
+ break;
}
}
break;
diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index 7eb5a0c..85aef77 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -338,6 +338,9 @@ void LBCode::parseComparisons() {
case kTokenNotEq:
debugN(" != ");
break;
+ default:
+ debugN(" ?? ");
+ break;
}
nextToken();
@@ -368,6 +371,8 @@ void LBCode::parseComparisons() {
case kTokenNotEq:
result = (val1 != val2);
break;
+ default:
+ break;
}
debugN(" [--> %s]", result ? "true" : "false");
@@ -461,6 +466,8 @@ void LBCode::parseArithmetic2() {
case kTokenModulo:
result = val1.toInt() % val2.toInt();
break;
+ default:
+ break;
}
}
@@ -1364,6 +1371,9 @@ void LBCode::cmdSetPlayParams(const Common::Array<LBValue> ¶ms) {
// TODO: _delayMin/Max
case 2:
target->_loopMode = params[1].integer;
+ break;
+ default:
+ break;
}
}
@@ -1675,6 +1685,8 @@ bool LBCode::parseCodeSymbol(Common::String name, uint &pos, Common::Array<byte>
cmdToken = kTokenItemCommand;
cmdCount = NUM_ITEM_COMMANDS;
break;
+ default:
+ break;
}
for (uint n = 0; n < cmdCount; n++) {
diff --git a/engines/mohawk/livingbooks_code.h b/engines/mohawk/livingbooks_code.h
index 6f6297d..16005e1 100644
--- a/engines/mohawk/livingbooks_code.h
+++ b/engines/mohawk/livingbooks_code.h
@@ -106,6 +106,8 @@ struct LBValue {
case kLBValueList:
list = val.list;
break;
+ default:
+ break;
}
}
diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index c25fd28..dc144eb 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -534,6 +534,8 @@ void MystGraphics::transitionDissolve(Common::Rect rect, uint step) {
case 4:
*((uint32 *)screen->getBasePtr(x, y)) = *((const uint32 *)_backBuffer->getBasePtr(x, y));
break;
+ default:
+ break;
}
}
}
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 2e70778..820fd71 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -1184,6 +1184,8 @@ void Myst::o_bookGivePage(uint16 var, const ArgumentsArray &args) {
case kBlueFirePlacePage:
mask = 32;
break;
+ default:
+ break;
}
// Wrong book
@@ -1330,6 +1332,8 @@ void Myst::o_imagerPlayButton(uint16 var, const ArgumentsArray &args) {
_state.imagerActive = 1;
}
break;
+ default:
+ break;
}
_vm->_cursor->showCursor();
@@ -1368,6 +1372,8 @@ void Myst::o_imagerEraseButton(uint16 var, const ArgumentsArray &args) {
case 67:
_state.imagerWaterErased = 1;
break;
+ default:
+ break;
}
_state.imagerActive = 0;
@@ -1521,6 +1527,8 @@ void Myst::generatorButtonValue(MystArea *button, uint16 &mask, uint16 &value) {
mask = 512;
value = 9;
break;
+ default:
+ break;
}
}
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index bcc16dc..e1b36f5 100644
--- a/engines/mohawk/myst_stacks/selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -511,6 +511,8 @@ void Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
else
videoName = "backl0";
break;
+ default:
+ break;
}
if (!videoName.empty()) {
@@ -615,6 +617,7 @@ void Selenitic::o_soundReceiverSigma(uint16 var, const ArgumentsArray &args) {
source = 3;
break;
case 1:
+ default:
source = 0;
break;
case 2:
@@ -799,6 +802,8 @@ MystAreaSlider *Selenitic::soundLockSliderFromVar(uint16 var) {
return _soundLockSlider4;
case 24:
return _soundLockSlider5;
+ default:
+ break;
}
return nullptr;
@@ -986,6 +991,8 @@ void Selenitic::soundReceiverIncreaseSpeed() {
case kSoundReceiverSpeedFaster:
// Can't go faster
break;
+ default:
+ break;
}
}
@@ -1080,6 +1087,8 @@ void Selenitic::soundReceiverSolution(uint16 source, uint16 &solution, bool &ena
enabled = _state.emitterEnabledWind;
solution = 2122;
break;
+ default:
+ break;
}
}
@@ -1135,6 +1144,8 @@ void Selenitic::o_soundLock_init(uint16 var, const ArgumentsArray &args) {
_soundLockSlider5 = _vm->getCard()->getResource<MystAreaSlider>(i);
_soundLockSlider5->setStep(_state.soundLockSliderPositions[4]);
break;
+ default:
+ break;
}
} else if (_vm->getCard()->_resources[i]->hasType(kMystAreaImageSwitch)
&& _vm->getCard()->_resources[i]->getImageSwitchVar() == 28) {
diff --git a/engines/mohawk/riven_stacks/gspit.cpp b/engines/mohawk/riven_stacks/gspit.cpp
index d2440ec..5e76787 100644
--- a/engines/mohawk/riven_stacks/gspit.cpp
+++ b/engines/mohawk/riven_stacks/gspit.cpp
@@ -339,6 +339,8 @@ void GSpit::xgplaywhark(const ArgumentArray &args) {
// Red alert! Shields online! Brace yourself for impact!
_vm->getCard()->playMovie(8);
break;
+ default:
+ break;
}
// For whatever reason the devs felt fit, code 31 is used for all of the videos
More information about the Scummvm-git-logs
mailing list