[Scummvm-cvs-logs] SF.net SVN: scummvm:[44295] scummvm/trunk/engines/tinsel

[thebluegr at users.sourceforge.net]

Revision: 44295
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44295&view=rev
Author:   thebluegr
Date:     2009-09-24 09:50:22 +0000 (Thu, 24 Sep 2009)

Log Message:
-----------
TINSEL: Fixed some warnings about unreachable code

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/anim.cpp
    scummvm/trunk/engines/tinsel/bmv.cpp
    scummvm/trunk/engines/tinsel/dialogs.cpp
    scummvm/trunk/engines/tinsel/polygons.cpp
    scummvm/trunk/engines/tinsel/tinlib.cpp

Modified: scummvm/trunk/engines/tinsel/anim.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/anim.cpp	2009-09-24 09:41:11 UTC (rev 44294)
+++ scummvm/trunk/engines/tinsel/anim.cpp	2009-09-24 09:50:22 UTC (rev 44295)
@@ -169,11 +169,13 @@
 			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
 

Modified: scummvm/trunk/engines/tinsel/bmv.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/bmv.cpp	2009-09-24 09:41:11 UTC (rev 44294)
+++ scummvm/trunk/engines/tinsel/bmv.cpp	2009-09-24 09:50:22 UTC (rev 44295)
@@ -1092,8 +1092,6 @@
 		currentSoundFrame++;
 		return true;
 	}
-
-	return true;
 }
 
 /**

Modified: scummvm/trunk/engines/tinsel/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/dialogs.cpp	2009-09-24 09:41:11 UTC (rev 44294)
+++ scummvm/trunk/engines/tinsel/dialogs.cpp	2009-09-24 09:50:22 UTC (rev 44295)
@@ -2115,8 +2115,8 @@
 	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;
 }
 
 /**

Modified: scummvm/trunk/engines/tinsel/polygons.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/polygons.cpp	2009-09-24 09:41:11 UTC (rev 44294)
+++ scummvm/trunk/engines/tinsel/polygons.cpp	2009-09-24 09:50:22 UTC (rev 44295)
@@ -1273,7 +1273,7 @@
 			return i;
 	}
 	error("FirstPathPoly() - no PATH polygons");
-	return NOPOLY;
+	//return NOPOLY;
 }
 
 HPOLYGON GetPolyHandle(int i) {

Modified: scummvm/trunk/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.cpp	2009-09-24 09:41:11 UTC (rev 44294)
+++ scummvm/trunk/engines/tinsel/tinlib.cpp	2009-09-24 09:50:22 UTC (rev 44295)
@@ -5639,7 +5639,7 @@
 		error("Unsupported library function");
 	}
 
-	error("Can't possibly get here");
+	//error("Can't possibly get here");
 }
 
 } // end of namespace Tinsel


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.