diff options
| author | Filippos Karapetis | 2009-09-24 17:24:42 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-24 17:24:42 +0000 |
| commit | a983c88e37196d56a70125a19bb7fc84cbd84fee (patch) | |
| tree | ee683134390d07cc9094146eab0e92e5182a6f08 | |
| parent | 5028d5a68bba66d3b66df6c4acef3f01356cf049 (diff) | |
| download | scummvm-rg350-a983c88e37196d56a70125a19bb7fc84cbd84fee.tar.gz scummvm-rg350-a983c88e37196d56a70125a19bb7fc84cbd84fee.tar.bz2 scummvm-rg350-a983c88e37196d56a70125a19bb7fc84cbd84fee.zip | |
Reverted parts of revisions #44292, #44293, #44295 and #44296, to prevent warnings and issues in compilers which don't support NORETURN
svn-id: r44312
| -rw-r--r-- | engines/agi/loader_v3.cpp | 3 | ||||
| -rw-r--r-- | engines/cruise/dataLoader.cpp | 1 | ||||
| -rw-r--r-- | engines/made/database.cpp | 4 | ||||
| -rw-r--r-- | engines/tinsel/anim.cpp | 1 | ||||
| -rw-r--r-- | engines/tinsel/polygons.cpp | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp index 7e5e87d9a4..cd97c44521 100644 --- a/engines/agi/loader_v3.cpp +++ b/engines/agi/loader_v3.cpp @@ -218,8 +218,7 @@ uint8 *AgiLoader_v3::loadVolRes(AgiDir *agid) { debugC(3, kDebugLevelResources, "offset = %d", agid->offset); debugC(3, kDebugLevelResources, "x = %x %x", x[0], x[1]); error("ACK! BAD RESOURCE"); - - //_vm->quitGame(); + _vm->quitGame(); // for compilers that don't support NORETURN } agid->len = READ_LE_UINT16((uint8 *) x + 3); // uncompressed size diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index c2e183c75e..78aa2cc62d 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -168,6 +168,7 @@ int updateResFileEntry(int height, int width, int size, int entryNumber, int res int createResFileEntry(int width, int height, int size, int resType) { error("Executing untested createResFileEntry"); + return 0; // for compilers that don't support NORETURN #if 0 int i; diff --git a/engines/made/database.cpp b/engines/made/database.cpp index 2bf252b31f..70f5db30d4 100644 --- a/engines/made/database.cpp +++ b/engines/made/database.cpp @@ -80,7 +80,7 @@ int16 Object::getVectorSize() { } else { // should never reach here error("Unknown object class"); - //return 0; + return 0; // for compilers that don't support NORETURN } } @@ -94,7 +94,7 @@ int16 Object::getVectorItem(int16 index) { } else { // should never reach here error("Unknown object class"); - //return 0; + return 0; // for compilers that don't support NORETURN } } diff --git a/engines/tinsel/anim.cpp b/engines/tinsel/anim.cpp index 897b436d20..1ae419e51b 100644 --- a/engines/tinsel/anim.cpp +++ b/engines/tinsel/anim.cpp @@ -168,6 +168,7 @@ SCRIPTSTATE DoNextFrame(ANIM *pAnim) { // in case we missed something (highly unlikely though) error("ANI_CALL opcode encountered! Please report this error to the ScummVM team"); //(*pAni[pAnim->scriptIndex].pFunc)(pAnim); + return; // for compilers that don't support NORETURN #if 0 // next opcode diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp index 0a45bc0d9f..3ee88c3112 100644 --- a/engines/tinsel/polygons.cpp +++ b/engines/tinsel/polygons.cpp @@ -1273,7 +1273,7 @@ HPOLYGON FirstPathPoly(void) { return i; } error("FirstPathPoly() - no PATH polygons"); - //return NOPOLY; + return NOPOLY; // for compilers that don't support NORETURN } HPOLYGON GetPolyHandle(int i) { |