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

[thebluegr at users.sourceforge.net]

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

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

Modified Paths:
--------------
    scummvm/trunk/engines/m4/script.cpp
    scummvm/trunk/engines/m4/sound.cpp
    scummvm/trunk/engines/parallaction/disk_ns.cpp
    scummvm/trunk/engines/parallaction/objects.cpp
    scummvm/trunk/engines/saga/actor.cpp
    scummvm/trunk/engines/saga/detection.cpp
    scummvm/trunk/engines/saga/sound.cpp
    scummvm/trunk/engines/sword1/logic.cpp
    scummvm/trunk/engines/sword2/interpreter.cpp

Modified: scummvm/trunk/engines/m4/script.cpp
===================================================================
--- scummvm/trunk/engines/m4/script.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/m4/script.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -782,7 +782,7 @@
 
 	}
 
-	return false;
+	//return false;
 
 }
 

Modified: scummvm/trunk/engines/m4/sound.cpp
===================================================================
--- scummvm/trunk/engines/m4/sound.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/m4/sound.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -61,7 +61,7 @@
 
 	error("Sound::getHandle(): Too many sound handles");
 
-	return NULL;
+	//return NULL;
 }
 
 bool Sound::isHandleActive(SndHandle *handle) {

Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -628,12 +628,16 @@
 			break;
 		case 0x50504C53: /* PPLS */
 			error("PPLS crunched files are not supported");
+#if 0
 			eff = 8;
 			break;
+#endif
 		case 0x50583230: /* PX20 */
 			error("PX20 crunched files are not supported");
+#if 0
 			eff = 6;
 			break;
+#endif
 		default:
 			eff = 0;
 

Modified: scummvm/trunk/engines/parallaction/objects.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/objects.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/parallaction/objects.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -304,7 +304,7 @@
 
 	error("Parameter is not an r-value");
 
-	return 0;
+	//return 0;
 }
 
 void ScriptVar::setValue(int16 value) {

Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/saga/actor.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -778,7 +778,7 @@
 		case kFramePickUp:
 		case kFrameLook:
 			error("Actor::getFrameType() unknown frame type %d", frameType);
-			return kFrameIHNMStand;
+			//return kFrameIHNMStand;
 		}
 #endif
 	}

Modified: scummvm/trunk/engines/saga/detection.cpp
===================================================================
--- scummvm/trunk/engines/saga/detection.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/saga/detection.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -338,7 +338,7 @@
 #endif
 		default:
 			error("getDisplayInfo: Unknown game ID");
-			return ITE_DisplayInfo;		// unreachable
+			//return ITE_DisplayInfo;		// unreachable
 	}
 }
 

Modified: scummvm/trunk/engines/saga/sound.cpp
===================================================================
--- scummvm/trunk/engines/saga/sound.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/saga/sound.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -60,7 +60,7 @@
 
 	error("Sound::getHandle(): Too many sound handles");
 
-	return NULL;
+	//return NULL;
 }
 
 void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int volume,

Modified: scummvm/trunk/engines/sword1/logic.cpp
===================================================================
--- scummvm/trunk/engines/sword1/logic.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/sword1/logic.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -690,7 +690,7 @@
 			break;
 		default:
 			error("Invalid operator %d",scriptCode[pc-1]);
-			return 0;
+			//return 0;
 		}
 	}
 }
@@ -1252,7 +1252,7 @@
 //The game is halted for debugging. Maybe we'll remove this later.
 int Logic::fnTalkError(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
 	error("fnTalkError for id %d, instruction %d", id, cpt->o_down_flag);
-	return SCRIPT_STOP;
+	//return SCRIPT_STOP;
 }
 
 int Logic::fnStartTalk(Object *cpt, int32 id, int32 target, int32 d, int32 e, int32 f, int32 z, int32 x) {
@@ -1607,7 +1607,7 @@
 
 int Logic::fnInnerSpace(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
 	error("fnInnerSpace() not working.");
-	return SCRIPT_STOP;
+	//return SCRIPT_STOP;
 }
 
 int Logic::fnSetScreen(Object *cpt, int32 id, int32 target, int32 screen, int32 c, int32 d, int32 z, int32 x) {

Modified: scummvm/trunk/engines/sword2/interpreter.cpp
===================================================================
--- scummvm/trunk/engines/sword2/interpreter.cpp	2009-09-24 10:02:13 UTC (rev 44299)
+++ scummvm/trunk/engines/sword2/interpreter.cpp	2009-09-24 10:15:50 UTC (rev 44300)
@@ -325,7 +325,7 @@
 
 	if (READ_LE_UINT32(checksumBlock) != 12345678) {
 		error("Invalid script in object %s", header.name);
-		return 0;
+		//return 0;
 	}
 
 	int32 codeLen = READ_LE_UINT32(checksumBlock + 4);
@@ -754,7 +754,7 @@
 			break;
 		default:
 			error("Invalid script command %d", curCommand);
-			return 3;
+			//return 3;
 		}
 	}
 


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