[Scummvm-cvs-logs] SF.net SVN: scummvm:[44298] scummvm/trunk/engines/agos

[thebluegr at users.sourceforge.net]

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

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

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

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2009-09-24 09:53:09 UTC (rev 44297)
+++ scummvm/trunk/engines/agos/items.cpp	2009-09-24 09:53:51 UTC (rev 44298)
@@ -225,7 +225,7 @@
 	error("actor: is this code ever used?");
 	//if (_actorPlayer)
 	//	return _actorPlayer;
-	return _dummyItem1;
+	//return _dummyItem1;
 }
 
 Item *AGOSEngine::getNextItemPtr() {
@@ -455,7 +455,7 @@
 		if (_itemArrayPtr[i] == id)
 			return i;
 	error("itemPtrToID: not found");
-	return 0;
+	//return 0;
 }
 
 } // End of namespace AGOS

Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp	2009-09-24 09:53:09 UTC (rev 44297)
+++ scummvm/trunk/engines/agos/saveload.cpp	2009-09-24 09:53:51 UTC (rev 44298)
@@ -1657,7 +1657,7 @@
 		delete f;
 		restartAnimation();
 		error("Couldn't save ");
-		return 0;
+		//return 0;
 	}
 	f->finalize();
 	delete f;

Modified: scummvm/trunk/engines/agos/string.cpp
===================================================================
--- scummvm/trunk/engines/agos/string.cpp	2009-09-24 09:53:09 UTC (rev 44297)
+++ scummvm/trunk/engines/agos/string.cpp	2009-09-24 09:53:51 UTC (rev 44298)
@@ -180,7 +180,7 @@
 	default:
 		error("getTextLocation: Invalid text location %d", a);
 	}
-	return NULL;
+	//return NULL;
 }
 
 void AGOSEngine::allocateStringTable(int num) {

Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp	2009-09-24 09:53:09 UTC (rev 44297)
+++ scummvm/trunk/engines/agos/window.cpp	2009-09-24 09:53:51 UTC (rev 44298)
@@ -42,7 +42,7 @@
 			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) {


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