From 6b79910bcb5d70a116a1ff2cc3e8b011734ecb70 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 24 Sep 2009 10:15:50 +0000
Subject: Fixed some more warnings about unreachable code

svn-id: r44300
---
 engines/m4/script.cpp            | 2 +-
 engines/m4/sound.cpp             | 2 +-
 engines/parallaction/disk_ns.cpp | 4 ++++
 engines/parallaction/objects.cpp | 2 +-
 engines/saga/actor.cpp           | 2 +-
 engines/saga/detection.cpp       | 2 +-
 engines/saga/sound.cpp           | 2 +-
 engines/sword1/logic.cpp         | 6 +++---
 engines/sword2/interpreter.cpp   | 4 ++--
 9 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/m4/script.cpp b/engines/m4/script.cpp
index 659c7e9f05..047c228e7d 100644
--- a/engines/m4/script.cpp
+++ b/engines/m4/script.cpp
@@ -782,7 +782,7 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
 
 	}
 
-	return false;
+	//return false;
 
 }
 
diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp
index 542e8ebdcd..f640149026 100644
--- a/engines/m4/sound.cpp
+++ b/engines/m4/sound.cpp
@@ -61,7 +61,7 @@ SndHandle *Sound::getHandle() {
 
 	error("Sound::getHandle(): Too many sound handles");
 
-	return NULL;
+	//return NULL;
 }
 
 bool Sound::isHandleActive(SndHandle *handle) {
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index d35b338069..bb59aa3a32 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -628,12 +628,16 @@ private:
 			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;
 
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index 4ed198d240..3a77077702 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -304,7 +304,7 @@ int16 ScriptVar::getValue() {
 
 	error("Parameter is not an r-value");
 
-	return 0;
+	//return 0;
 }
 
 void ScriptVar::setValue(int16 value) {
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp
index fb1cb0b5c1..54fcb8a162 100644
--- a/engines/saga/actor.cpp
+++ b/engines/saga/actor.cpp
@@ -778,7 +778,7 @@ int Actor::getFrameType(ActorFrameTypes frameType) {
 		case kFramePickUp:
 		case kFrameLook:
 			error("Actor::getFrameType() unknown frame type %d", frameType);
-			return kFrameIHNMStand;
+			//return kFrameIHNMStand;
 		}
 #endif
 	}
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 265008992a..1025c230d6 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -338,7 +338,7 @@ const GameDisplayInfo &SagaEngine::getDisplayInfo() {
 #endif
 		default:
 			error("getDisplayInfo: Unknown game ID");
-			return ITE_DisplayInfo;		// unreachable
+			//return ITE_DisplayInfo;		// unreachable
 	}
 }
 
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 14e5492a48..051c378e0c 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -60,7 +60,7 @@ SndHandle *Sound::getHandle() {
 
 	error("Sound::getHandle(): Too many sound handles");
 
-	return NULL;
+	//return NULL;
 }
 
 void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int volume,
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index be3797b0bd..769bf6d4c5 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -690,7 +690,7 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
 			break;
 		default:
 			error("Invalid operator %d",scriptCode[pc-1]);
-			return 0;
+			//return 0;
 		}
 	}
 }
@@ -1252,7 +1252,7 @@ int Logic::fnChangeSpeechText(Object *cpt, int32 id, int32 tar, int32 width, int
 //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::fnStopMusic(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d
 
 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) {
diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp
index 13d42df74f..b48e92acb6 100644
--- a/engines/sword2/interpreter.cpp
+++ b/engines/sword2/interpreter.cpp
@@ -325,7 +325,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) {
 
 	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 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) {
 			break;
 		default:
 			error("Invalid script command %d", curCommand);
-			return 3;
+			//return 3;
 		}
 	}
 
-- 
cgit v1.2.3