diff options
| author | Filippos Karapetis | 2009-09-24 17:52:53 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-24 17:52:53 +0000 |
| commit | b4f1960318e3e0460e4fa00bb74d75ffda9f4e79 (patch) | |
| tree | fda717a83a3e9442d950aa23d673f267d3283631 /engines/saga | |
| parent | 0ea3cde160dc5c45ff5571258b838920e11ebe2b (diff) | |
| download | scummvm-rg350-b4f1960318e3e0460e4fa00bb74d75ffda9f4e79.tar.gz scummvm-rg350-b4f1960318e3e0460e4fa00bb74d75ffda9f4e79.tar.bz2 scummvm-rg350-b4f1960318e3e0460e4fa00bb74d75ffda9f4e79.zip | |
Reverted parts of revisions #44298, #44299 and #44300, to prevent warnings and issues in compilers which don't support NORETURN
svn-id: r44314
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/actor.cpp | 2 | ||||
| -rw-r--r-- | engines/saga/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/saga/sound.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 54fcb8a162..699eb39405 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -778,7 +778,7 @@ int Actor::getFrameType(ActorFrameTypes frameType) { case kFramePickUp: case kFrameLook: error("Actor::getFrameType() unknown frame type %d", frameType); - //return kFrameIHNMStand; + return kFrameIHNMStand; // for compilers that don't support NORETURN } #endif } diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 1025c230d6..807345cd7b 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -338,7 +338,7 @@ const GameDisplayInfo &SagaEngine::getDisplayInfo() { #endif default: error("getDisplayInfo: Unknown game ID"); - //return ITE_DisplayInfo; // unreachable + return ITE_DisplayInfo; // for compilers that don't support NORETURN } } diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index 051c378e0c..79e5cbeb87 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -60,7 +60,7 @@ SndHandle *Sound::getHandle() { error("Sound::getHandle(): Too many sound handles"); - //return NULL; + return NULL; // for compilers that don't support NORETURN } void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int volume, |