diff options
| author | D G Turner | 2019-12-01 01:21:09 +0000 |
|---|---|---|
| committer | D G Turner | 2019-12-01 01:21:09 +0000 |
| commit | 538bb7ab3e2ce73ef57833859455ceb76467ce54 (patch) | |
| tree | edac4a6ff97c7018ed343575333a07cd65532a1c /engines/sherlock | |
| parent | ef30ebc0bb1f72d4ad12074ae6e808a2b8225af2 (diff) | |
| download | scummvm-rg350-538bb7ab3e2ce73ef57833859455ceb76467ce54.tar.gz scummvm-rg350-538bb7ab3e2ce73ef57833859455ceb76467ce54.tar.bz2 scummvm-rg350-538bb7ab3e2ce73ef57833859455ceb76467ce54.zip | |
SHERLOCK: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/objects.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_people.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 9 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 3 |
5 files changed, 20 insertions, 0 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index c7eee36544..6acb8da2c4 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -130,6 +130,7 @@ bool BaseObject::hasAborts() const { case TELEPORT_CODE: idx += 4; break; case CALL_TALK_CODE:idx += 8; break; case HIDE_CODE: idx += 2; break; + default: break; } } } while (idx < _seqSize); @@ -1281,6 +1282,7 @@ void Object::setObjTalkSequence(int seq) { case TELEPORT_CODE: idx += 4; break; case CALL_TALK_CODE: idx += 8; break; case HIDE_CODE: idx += 2; break; + default: break; } } diff --git a/engines/sherlock/scalpel/scalpel_people.cpp b/engines/sherlock/scalpel/scalpel_people.cpp index 924095cd50..8b71f533e4 100644 --- a/engines/sherlock/scalpel/scalpel_people.cpp +++ b/engines/sherlock/scalpel/scalpel_people.cpp @@ -275,6 +275,8 @@ void ScalpelPerson::setWalking() { case WALK_RIGHT: _sequenceNumber = WALK_DOWNRIGHT; break; + default: + break; } } } else if (_delta.y < -150) { @@ -286,6 +288,8 @@ void ScalpelPerson::setWalking() { case WALK_RIGHT: _sequenceNumber = WALK_UPRIGHT; break; + default: + break; } } } diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index 8f0ebbf1b5..b39ccbe0c5 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -1738,6 +1738,8 @@ void ScalpelUserInterface::doTalkControl() { case 3: people._portraitSide = 120; break; + default: + break; } // Check for flipping Holmes diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index 458cc1a9c2..0eecfe05c4 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -314,6 +314,7 @@ void TattooPerson::gotoStand() { case WALK_DOWNLEFT: _sequenceNumber = STOP_DOWNLEFT;break; case WALK_LEFT: _sequenceNumber = STOP_LEFT; break; case WALK_UPLEFT: _sequenceNumber = STOP_UPLEFT; break; + default: break; } } @@ -439,6 +440,8 @@ void TattooPerson::setWalking() { case WALK_RIGHT: _sequenceNumber = WALK_DOWNRIGHT; break; + default: + break; } } else if (_delta.y < -1500) { if (_sequenceNumber == WALK_LEFT || _sequenceNumber == WALK_RIGHT) { @@ -455,6 +458,8 @@ void TattooPerson::setWalking() { case WALK_RIGHT: _sequenceNumber = WALK_UPRIGHT; break; + default: + break; } } } else { @@ -773,6 +778,8 @@ void TattooPerson::updateNPC() { case NPCPATH_IFFLAG_GOTO_LABEL: _npcIndex += 4; break; + default: + break; } } break; @@ -819,6 +826,8 @@ void TattooPerson::updateNPC() { case NPCPATH_IFFLAG_GOTO_LABEL: _npcIndex += 4; break; + default: + break; } } } diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index 1cb0220bba..2b7b7fb5f4 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -857,6 +857,9 @@ void TattooUserInterface::drawMaskArea(bool mode) { maskArea(*_mask, Common::Point(xp, 203)); maskArea(*_mask1, Common::Point(124 + xp, 239)); break; + + default: + break; } } } |