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/agos | |
| 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/agos')
| -rw-r--r-- | engines/agos/items.cpp | 4 | ||||
| -rw-r--r-- | engines/agos/saveload.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/string.cpp | 2 | ||||
| -rw-r--r-- | engines/agos/window.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index 561877fe9c..874bf1a802 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -225,7 +225,7 @@ Item *AGOSEngine::actor() { error("actor: is this code ever used?"); //if (_actorPlayer) // return _actorPlayer; - //return _dummyItem1; + return _dummyItem1; // for compilers that don't support NORETURN } Item *AGOSEngine::getNextItemPtr() { @@ -455,7 +455,7 @@ uint AGOSEngine::itemPtrToID(Item *id) { if (_itemArrayPtr[i] == id) return i; error("itemPtrToID: not found"); - //return 0; + return 0; // for compilers that don't support NORETURN } } // End of namespace AGOS diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index 4ef50efc8f..dfd11a4514 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -1657,7 +1657,7 @@ int AGOSEngine_PN::saveFile(char *name) { delete f; restartAnimation(); error("Couldn't save "); - //return 0; + return 0; // for compilers that don't support NORETURN } f->finalize(); delete f; diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index 4b3f69de66..62f06ab12c 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -180,7 +180,7 @@ TextLocation *AGOSEngine::getTextLocation(uint a) { default: error("getTextLocation: Invalid text location %d", a); } - //return NULL; + return NULL; // for compilers that don't support NORETURN } void AGOSEngine::allocateStringTable(int num) { diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index fb197127bc..54e7928f38 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -42,7 +42,7 @@ uint AGOSEngine::getWindowNum(WindowBlock *window) { return i; error("getWindowNum: not found"); - //return 0; + return 0; // for compilers that don't support NORETURN } WindowBlock *AGOSEngine::openWindow(uint x, uint y, uint w, uint h, uint flags, uint fillColor, uint textColor) { |