aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2009-09-24 09:50:22 +0000
committerFilippos Karapetis2009-09-24 09:50:22 +0000
commit3a976bfb6fdef95f18778168bbd3f61764d3394b (patch)
treea005ab9ef2cfa8a9bf9193a8e485eff36f6f9c1d /engines
parentfbe1586abc2435bedd867baede387ba119f4c632 (diff)
downloadscummvm-rg350-3a976bfb6fdef95f18778168bbd3f61764d3394b.tar.gz
scummvm-rg350-3a976bfb6fdef95f18778168bbd3f61764d3394b.tar.bz2
scummvm-rg350-3a976bfb6fdef95f18778168bbd3f61764d3394b.zip
TINSEL: Fixed some warnings about unreachable code
svn-id: r44295
Diffstat (limited to 'engines')
-rw-r--r--engines/tinsel/anim.cpp2
-rw-r--r--engines/tinsel/bmv.cpp2
-rw-r--r--engines/tinsel/dialogs.cpp4
-rw-r--r--engines/tinsel/polygons.cpp2
-rw-r--r--engines/tinsel/tinlib.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/tinsel/anim.cpp b/engines/tinsel/anim.cpp
index b52d01860b..897b436d20 100644
--- a/engines/tinsel/anim.cpp
+++ b/engines/tinsel/anim.cpp
@@ -169,11 +169,13 @@ SCRIPTSTATE DoNextFrame(ANIM *pAnim) {
error("ANI_CALL opcode encountered! Please report this error to the ScummVM team");
//(*pAni[pAnim->scriptIndex].pFunc)(pAnim);
+#if 0
// next opcode
pAnim->scriptIndex++;
// go fetch a real image
break;
+#endif
case ANI_HIDE: // hide animated object
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 1e9693542e..9f3616baad 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -1092,8 +1092,6 @@ static bool DoSoundFrame(void) {
currentSoundFrame++;
return true;
}
-
- return true;
}
/**
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index d395027ad9..1deed09f17 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -2115,8 +2115,8 @@ int InvItem(Common::Point &coOrds, bool update) {
int x = coOrds.x;
int y = coOrds.y;
return InvItem(&x, &y, update);
- coOrds.x = x;
- coOrds.y = y;
+ //coOrds.x = x;
+ //coOrds.y = y;
}
/**
diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp
index 825abc9a6b..0a45bc0d9f 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;
}
HPOLYGON GetPolyHandle(int i) {
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index b97f8841ef..2a5fc5af08 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -5639,7 +5639,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
error("Unsupported library function");
}
- error("Can't possibly get here");
+ //error("Can't possibly get here");
}
} // end of namespace Tinsel