aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-09-24 09:53:51 +0000
committerFilippos Karapetis2009-09-24 09:53:51 +0000
commit9026b635039880a8278174321039e9e7de1b1dc0 (patch)
tree25f2cf1eae0a5d3c3ee403d75535ec6220762685 /engines
parentc91f5759b934faf42c208deb8b6c239769bdcb99 (diff)
downloadscummvm-rg350-9026b635039880a8278174321039e9e7de1b1dc0.tar.gz
scummvm-rg350-9026b635039880a8278174321039e9e7de1b1dc0.tar.bz2
scummvm-rg350-9026b635039880a8278174321039e9e7de1b1dc0.zip
AGOS: Fixed some warnings about unreachable code
svn-id: r44298
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/items.cpp4
-rw-r--r--engines/agos/saveload.cpp2
-rw-r--r--engines/agos/string.cpp2
-rw-r--r--engines/agos/window.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index 49792b99c5..561877fe9c 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;
}
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;
}
} // End of namespace AGOS
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 068f51dbb9..4ef50efc8f 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;
}
f->finalize();
delete f;
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 1d8bb0b976..4b3f69de66 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;
}
void AGOSEngine::allocateStringTable(int num) {
diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp
index 8bf4102067..fb197127bc 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;
}
WindowBlock *AGOSEngine::openWindow(uint x, uint y, uint w, uint h, uint flags, uint fillColor, uint textColor) {