[Scummvm-cvs-logs] SF.net SVN: scummvm:[44312] scummvm/trunk/engines
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Sep 24 19:24:42 CEST 2009
Revision: 44312
http://scummvm.svn.sourceforge.net/scummvm/?rev=44312&view=rev
Author: thebluegr
Date: 2009-09-24 17:24:42 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
Reverted parts of revisions #44292, #44293, #44295 and #44296, to prevent warnings and issues in compilers which don't support NORETURN
Modified Paths:
--------------
scummvm/trunk/engines/agi/loader_v3.cpp
scummvm/trunk/engines/cruise/dataLoader.cpp
scummvm/trunk/engines/made/database.cpp
scummvm/trunk/engines/tinsel/anim.cpp
scummvm/trunk/engines/tinsel/polygons.cpp
Modified: scummvm/trunk/engines/agi/loader_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v3.cpp 2009-09-24 17:07:27 UTC (rev 44311)
+++ scummvm/trunk/engines/agi/loader_v3.cpp 2009-09-24 17:24:42 UTC (rev 44312)
@@ -218,8 +218,7 @@
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
Modified: scummvm/trunk/engines/cruise/dataLoader.cpp
===================================================================
--- scummvm/trunk/engines/cruise/dataLoader.cpp 2009-09-24 17:07:27 UTC (rev 44311)
+++ scummvm/trunk/engines/cruise/dataLoader.cpp 2009-09-24 17:24:42 UTC (rev 44312)
@@ -168,6 +168,7 @@
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;
Modified: scummvm/trunk/engines/made/database.cpp
===================================================================
--- scummvm/trunk/engines/made/database.cpp 2009-09-24 17:07:27 UTC (rev 44311)
+++ scummvm/trunk/engines/made/database.cpp 2009-09-24 17:24:42 UTC (rev 44312)
@@ -80,7 +80,7 @@
} else {
// should never reach here
error("Unknown object class");
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
}
@@ -94,7 +94,7 @@
} else {
// should never reach here
error("Unknown object class");
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
}
Modified: scummvm/trunk/engines/tinsel/anim.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/anim.cpp 2009-09-24 17:07:27 UTC (rev 44311)
+++ scummvm/trunk/engines/tinsel/anim.cpp 2009-09-24 17:24:42 UTC (rev 44312)
@@ -168,6 +168,7 @@
// 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
Modified: scummvm/trunk/engines/tinsel/polygons.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/polygons.cpp 2009-09-24 17:07:27 UTC (rev 44311)
+++ scummvm/trunk/engines/tinsel/polygons.cpp 2009-09-24 17:24:42 UTC (rev 44312)
@@ -1273,7 +1273,7 @@
return i;
}
error("FirstPathPoly() - no PATH polygons");
- //return NOPOLY;
+ return NOPOLY; // for compilers that don't support NORETURN
}
HPOLYGON GetPolyHandle(int i) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list