diff options
| author | D G Turner | 2019-12-01 15:11:36 +0000 |
|---|---|---|
| committer | D G Turner | 2019-12-01 15:11:36 +0000 |
| commit | f26bb57ef85368ae392fef129cf96b723a1e1b3d (patch) | |
| tree | 82ea8cf1a73671e2d35f0d4dfd227af41dcf8edb /engines/saga/actor.cpp | |
| parent | 7b275b454c1c143d97d238086ab3797f76576872 (diff) | |
| download | scummvm-rg350-f26bb57ef85368ae392fef129cf96b723a1e1b3d.tar.gz scummvm-rg350-f26bb57ef85368ae392fef129cf96b723a1e1b3d.tar.bz2 scummvm-rg350-f26bb57ef85368ae392fef129cf96b723a1e1b3d.zip | |
SAGA: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/saga/actor.cpp')
| -rw-r--r-- | engines/saga/actor.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 8c45a2890e..3c6a10e853 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -644,6 +644,9 @@ int Actor::getFrameType(ActorFrameTypes frameType) { return kFrameITEPickUp; case kFrameLook: return kFrameITELook; + default: + error("Actor::getFrameType() unknown frame type %d", frameType); + return kFrameITEStand; // for compilers that don't support NORETURN } #ifdef ENABLE_IHNM } else if (_vm->getGameId() == GID_IHNM) { @@ -661,12 +664,14 @@ int Actor::getFrameType(ActorFrameTypes frameType) { case kFrameGive: case kFramePickUp: case kFrameLook: + default: error("Actor::getFrameType() unknown frame type %d", frameType); return kFrameIHNMStand; // for compilers that don't support NORETURN } #endif } error("Actor::getFrameType() unknown frame type %d", frameType); + return kFrameITEStand; // for compilers that don't support NORETURN } ActorFrameRange *Actor::getActorFrameRange(uint16 actorId, int frameType) { @@ -797,6 +802,8 @@ void Actor::handleSpeech(int msec) { case 0: _activeSpeech.playingTime = 0x7fffff; break; + default: + break; } } else { _activeSpeech.playingTime = sampleLength; |