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/kyra | |
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/kyra')
-rw-r--r-- | engines/kyra/resource.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/screen_lok.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index ab59108825..3ef5589266 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -132,7 +132,7 @@ bool Resource::reset() { } } else { error("Unknown game id: %d", _vm->game()); - //return false; + return false; // for compilers that don't support NORETURN } return true; @@ -191,7 +191,7 @@ bool Resource::loadFileList(const Common::String &filedata) { } else if (!loadPakFile(filename)) { delete f; error("couldn't load file '%s'", filename.c_str()); - //return false; + return false; // for compilers that don't support NORETURN } } } @@ -207,7 +207,7 @@ bool Resource::loadFileList(const char * const *filelist, uint32 numFiles) { while (numFiles--) { if (!loadPakFile(filelist[numFiles])) { error("couldn't load file '%s'", filelist[numFiles]); - //return false; + return false; // for compilers that don't support NORETURN } } diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index de01eadccb..9ecdef325d 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -340,7 +340,7 @@ void Screen_LoK_16::getFadeParams(const Palette &pal, int delay, int &delayInc, int Screen_LoK_16::fadePalStep(const Palette &pal, int diff) { error("Screen_LoK_16::fadePalStep called"); - //return 0; + return 0; // for compilers that don't support NORETURN } void Screen_LoK_16::paletteMap(uint8 idx, int r, int g, int b) { diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 3b18bca40d..c1c6a5122d 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -106,7 +106,7 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename); if (!stream) { error("Couldn't open script file '%s'", filename); - //return false; + return false; // for compilers that don't support NORETURN } memset(scriptData, 0, sizeof(EMCData)); |