[Scummvm-cvs-logs] SF.net SVN: scummvm:[44314] scummvm/trunk/engines
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Sep 24 19:52:53 CEST 2009
Revision: 44314
http://scummvm.svn.sourceforge.net/scummvm/?rev=44314&view=rev
Author: thebluegr
Date: 2009-09-24 17:52:53 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
Reverted parts of revisions #44298, #44299 and #44300, to prevent warnings and issues in compilers which don't support NORETURN
Modified Paths:
--------------
scummvm/trunk/engines/agos/items.cpp
scummvm/trunk/engines/agos/saveload.cpp
scummvm/trunk/engines/agos/string.cpp
scummvm/trunk/engines/agos/window.cpp
scummvm/trunk/engines/cruise/cruise.cpp
scummvm/trunk/engines/gob/hotspots.cpp
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/kyra/screen_lok.cpp
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/lure/strings.cpp
scummvm/trunk/engines/m4/script.cpp
scummvm/trunk/engines/m4/sound.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/parallaction/objects.cpp
scummvm/trunk/engines/saga/actor.cpp
scummvm/trunk/engines/saga/detection.cpp
scummvm/trunk/engines/saga/sound.cpp
scummvm/trunk/engines/sword1/logic.cpp
scummvm/trunk/engines/sword2/interpreter.cpp
Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/agos/items.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -225,7 +225,7 @@
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 @@
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
Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/agos/saveload.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -1657,7 +1657,7 @@
delete f;
restartAnimation();
error("Couldn't save ");
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
f->finalize();
delete f;
Modified: scummvm/trunk/engines/agos/string.cpp
===================================================================
--- scummvm/trunk/engines/agos/string.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/agos/string.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -180,7 +180,7 @@
default:
error("getTextLocation: Invalid text location %d", a);
}
- //return NULL;
+ return NULL; // for compilers that don't support NORETURN
}
void AGOSEngine::allocateStringTable(int num) {
Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/agos/window.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -42,7 +42,7 @@
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) {
Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/cruise/cruise.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -89,7 +89,7 @@
if (!loadLanguageStrings()) {
error("Could not setup language data for your version");
- //return Common::kUnknownError;
+ return Common::kUnknownError; // for compilers that don't support NORETURN
}
initialize();
Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/gob/hotspots.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -263,7 +263,7 @@
}
error("Hotspots::add(): Hotspot array full");
- //return 0xFFFF;
+ return 0xFFFF; // for compilers that don't support NORETURN
}
void Hotspots::remove(uint16 id) {
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/kyra/resource.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -132,7 +132,7 @@
}
} 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 @@
} 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 @@
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
}
}
Modified: scummvm/trunk/engines/kyra/screen_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lok.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/kyra/screen_lok.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -340,7 +340,7 @@
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) {
Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/kyra/script.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -106,7 +106,7 @@
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));
Modified: scummvm/trunk/engines/lure/strings.cpp
===================================================================
--- scummvm/trunk/engines/lure/strings.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/lure/strings.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -178,7 +178,7 @@
error("Unknown bit sequence encountered when decoding string");
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
void StringData::getString(uint16 stringId, char *dest, const char *hotspotName,
Modified: scummvm/trunk/engines/m4/script.cpp
===================================================================
--- scummvm/trunk/engines/m4/script.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/m4/script.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -782,8 +782,6 @@
}
- //return false;
-
}
// Kernel functions
Modified: scummvm/trunk/engines/m4/sound.cpp
===================================================================
--- scummvm/trunk/engines/m4/sound.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/m4/sound.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -60,8 +60,7 @@
}
error("Sound::getHandle(): Too many sound handles");
-
- //return NULL;
+ return NULL; // for compilers that don't support NORETURN
}
bool Sound::isHandleActive(SndHandle *handle) {
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -620,7 +620,7 @@
uint16 getCrunchType(uint32 signature) {
- byte eff;
+ byte eff = 0;
switch (signature) {
case 0x50503230: /* PP20 */
Modified: scummvm/trunk/engines/parallaction/objects.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/objects.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/parallaction/objects.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -303,8 +303,7 @@
}
error("Parameter is not an r-value");
-
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
void ScriptVar::setValue(int16 value) {
Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/saga/actor.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -778,7 +778,7 @@
case kFramePickUp:
case kFrameLook:
error("Actor::getFrameType() unknown frame type %d", frameType);
- //return kFrameIHNMStand;
+ return kFrameIHNMStand; // for compilers that don't support NORETURN
}
#endif
}
Modified: scummvm/trunk/engines/saga/detection.cpp
===================================================================
--- scummvm/trunk/engines/saga/detection.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/saga/detection.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -338,7 +338,7 @@
#endif
default:
error("getDisplayInfo: Unknown game ID");
- //return ITE_DisplayInfo; // unreachable
+ return ITE_DisplayInfo; // for compilers that don't support NORETURN
}
}
Modified: scummvm/trunk/engines/saga/sound.cpp
===================================================================
--- scummvm/trunk/engines/saga/sound.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/saga/sound.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -60,7 +60,7 @@
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,
Modified: scummvm/trunk/engines/sword1/logic.cpp
===================================================================
--- scummvm/trunk/engines/sword1/logic.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/sword1/logic.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -690,7 +690,7 @@
break;
default:
error("Invalid operator %d",scriptCode[pc-1]);
- //return 0;
+ return 0; // for compilers that don't support NORETURN
}
}
}
@@ -1252,7 +1252,7 @@
//The game is halted for debugging. Maybe we'll remove this later.
int Logic::fnTalkError(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
error("fnTalkError for id %d, instruction %d", id, cpt->o_down_flag);
- //return SCRIPT_STOP;
+ return SCRIPT_STOP; // for compilers that don't support NORETURN
}
int Logic::fnStartTalk(Object *cpt, int32 id, int32 target, int32 d, int32 e, int32 f, int32 z, int32 x) {
@@ -1607,7 +1607,7 @@
int Logic::fnInnerSpace(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
error("fnInnerSpace() not working.");
- //return SCRIPT_STOP;
+ return SCRIPT_STOP; // for compilers that don't support NORETURN
}
int Logic::fnSetScreen(Object *cpt, int32 id, int32 target, int32 screen, int32 c, int32 d, int32 z, int32 x) {
Modified: scummvm/trunk/engines/sword2/interpreter.cpp
===================================================================
--- scummvm/trunk/engines/sword2/interpreter.cpp 2009-09-24 17:28:14 UTC (rev 44313)
+++ scummvm/trunk/engines/sword2/interpreter.cpp 2009-09-24 17:52:53 UTC (rev 44314)
@@ -754,7 +754,7 @@
break;
default:
error("Invalid script command %d", curCommand);
- //return 3;
+ return 3; // for compilers that don't support NORETURN
}
}
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