[Scummvm-cvs-logs] SF.net SVN: scummvm:[44299] scummvm/trunk/engines
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Sep 24 12:02:14 CEST 2009
Revision: 44299
http://scummvm.svn.sourceforge.net/scummvm/?rev=44299&view=rev
Author: thebluegr
Date: 2009-09-24 10:02:13 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
Fixed some more warnings about unreachable code
Modified Paths:
--------------
scummvm/trunk/engines/cruise/cruise.cpp
scummvm/trunk/engines/cruise/volume.cpp
scummvm/trunk/engines/gob/demos/demoplayer.cpp
scummvm/trunk/engines/gob/expression.cpp
scummvm/trunk/engines/gob/hotspots.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/resource.cpp
scummvm/trunk/engines/kyra/screen_lok.cpp
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/lure/strings.cpp
Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/cruise/cruise.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -89,7 +89,7 @@
if (!loadLanguageStrings()) {
error("Could not setup language data for your version");
- return Common::kUnknownError;
+ //return Common::kUnknownError;
}
initialize();
Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/cruise/volume.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -36,10 +36,9 @@
char currentBaseName[15] = "";
void loadPal(volumeDataStruct *entry) {
- char name[20];
-
// This code isn't currently being used
#if 0
+ char name[20];
if (PAL_file.isOpen())
PAL_file.close();
Modified: scummvm/trunk/engines/gob/demos/demoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/demos/demoplayer.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/gob/demos/demoplayer.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -103,8 +103,6 @@
default:
return false;
}
-
- return false;
}
bool DemoPlayer::lineStartsWith(const Common::String &line, const char *start) {
Modified: scummvm/trunk/engines/gob/expression.cpp
===================================================================
--- scummvm/trunk/engines/gob/expression.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/gob/expression.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -204,13 +204,14 @@
void Expression::printExpr(char stopToken) {
// Expression printing disabled by default
- return;
+#if 0
int32 savedPos = _vm->_game->_script->pos();
printExpr_internal(stopToken);
// restore IP to start of expression
_vm->_game->_script->seek(savedPos);
+#endif
}
void Expression::printExpr_internal(char stopToken) {
Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/gob/hotspots.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -263,7 +263,7 @@
}
error("Hotspots::add(): Hotspot array full");
- return 0xFFFF;
+ //return 0xFFFF;
}
void Hotspots::remove(uint16 id) {
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -1309,7 +1309,7 @@
return _characters[charNum].skillLevels[index] + _characters[charNum].skillModifiers[index];
}
- return 1;
+ //return 1;
}
int LoLEngine::calculateProtection(int index) {
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/kyra/resource.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -132,7 +132,7 @@
}
} else {
error("Unknown game id: %d", _vm->game());
- return false;
+ //return false;
}
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;
}
}
}
@@ -207,7 +207,7 @@
while (numFiles--) {
if (!loadPakFile(filelist[numFiles])) {
error("couldn't load file '%s'", filelist[numFiles]);
- return false;
+ //return false;
}
}
Modified: scummvm/trunk/engines/kyra/screen_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lok.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/kyra/screen_lok.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -340,7 +340,7 @@
int Screen_LoK_16::fadePalStep(const Palette &pal, int diff) {
error("Screen_LoK_16::fadePalStep called");
- return 0;
+ //return 0;
}
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 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/kyra/script.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -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;
}
memset(scriptData, 0, sizeof(EMCData));
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -909,9 +909,11 @@
loop = false;
} else {
error("Unknown Euphony music event 0x%02X", (int)cmd);
+#if 0
memset(&info, 0, sizeof(info));
pos = 0;
loop = false;
+#endif
}
}
_position._play_pos = pos;
Modified: scummvm/trunk/engines/lure/strings.cpp
===================================================================
--- scummvm/trunk/engines/lure/strings.cpp 2009-09-24 09:53:51 UTC (rev 44298)
+++ scummvm/trunk/engines/lure/strings.cpp 2009-09-24 10:02:13 UTC (rev 44299)
@@ -178,7 +178,7 @@
error("Unknown bit sequence encountered when decoding string");
- return 0;
+ //return 0;
}
void StringData::getString(uint16 stringId, char *dest, const char *hotspotName,
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