Strict mode: Turned several severe errors (almost all detection related) into errors, instead of warnings

svn-id: r49972

6 files changed, 18 insertions, 18 deletions

diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index 4eb6bf2a56..e8f2fe326c 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -51,13 +51,13 @@ reg_t GameFeatures::getDetectionAddr(const Common::String &objName, Selector slc
 	reg_t addr;
 
 	if (objAddr.isNull()) {
-		warning("getDetectionAddr: %s object couldn't be found", objName.c_str());
+		error("getDetectionAddr: %s object couldn't be found", objName.c_str());
 		return NULL_REG;
 	}
 
 	if (methodNum == -1) {
 		if (lookupSelector(_segMan, objAddr, slc, NULL, &addr) != kSelectorMethod) {
-			warning("getDetectionAddr: target selector is not a method of object %s", objName.c_str());
+			error("getDetectionAddr: target selector is not a method of object %s", objName.c_str());
 			return NULL_REG;
 		}
 	} else {
@@ -491,7 +491,7 @@ MoveCountType GameFeatures::detectMoveCountType() {
 			_moveCountType = kIncrementMoveCount;
 		} else {
 			if (!autoDetectMoveCountType()) {
-				warning("Move count autodetection failed");
+				error("Move count autodetection failed");
 				_moveCountType = kIncrementMoveCount;	// Most games do this, so best guess
 			}
 		}
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index d4af4ade5c..83407c140d 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -80,7 +80,7 @@ reg_t kDoCdAudio(EngineState *s, int argc, reg_t *argv) {
 		// Init
 		return make_reg(0, 1);
 	default:
-		warning("kCdDoAudio: Unhandled case %d", argv[0].toUint16());
+		error("kCdDoAudio: Unhandled case %d", argv[0].toUint16());
 	}
 
 	return s->r_acc;
@@ -223,7 +223,7 @@ reg_t kDoSync(EngineState *s, int argc, reg_t *argv) {
 		g_sci->_audio->stopSoundSync();
 		break;
 	default:
-		warning("DoSync: Unhandled subfunction %d", argv[0].toUint16());
+		error("DoSync: Unhandled subfunction %d", argv[0].toUint16());
 	}
 
 	return s->r_acc;
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index 523e8321db..a4bde9b582 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -161,7 +161,7 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
 		reader = new MessageReaderV4(res->data, res->size);
 		break;
 	default:
-		warning("Message: unsupported resource version %d", version);
+		error("Message: unsupported resource version %d", version);
 		return false;
 	}
 
@@ -259,7 +259,7 @@ void MessageState::popCursorStack() {
 	if (!_cursorStackStack.empty())
 		_cursorStack = _cursorStackStack.pop();
 	else
-		warning("Message: attempt to pop from empty stack");
+		error("Message: attempt to pop from empty stack");
 }
 
 int MessageState::hexDigitToInt(char h) {
@@ -380,7 +380,7 @@ void MessageState::outputString(reg_t buf, const Common::String &str) {
 		if ((unsigned)buffer_r.maxSize >= str.size() + 1) {
 			_segMan->strcpy(buf, str.c_str());
 		} else {
-			warning("Message: buffer %04x:%04x invalid or too small to hold the following text of %i bytes: '%s'", PRINT_REG(buf), str.size() + 1, str.c_str());
+			error("Message: buffer %04x:%04x invalid or too small to hold the following text of %i bytes: '%s'", PRINT_REG(buf), str.size() + 1, str.c_str());
 
 			// Set buffer to empty string if possible
 			if (buffer_r.maxSize > 0)
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index bda854cfd0..46a8352567 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -714,7 +714,7 @@ void ResourceManager::init() {
 		debugC(1, kDebugLevelResMan, "resMan: Detected Amiga graphic resources");
 		break;
 	default:
-		warning("resMan: Couldn't determine view type");
+		error("resMan: Couldn't determine view type");
 	}
 }
 
@@ -1116,7 +1116,7 @@ void ResourceManager::processPatch(ResourceSource *source, ResourceType resource
 				patchDataOffset = 8;
 				break;
 			default:
-				warning("Resource patch unsupported special case %X", patchDataOffset & 0x7F);
+				error("Resource patch unsupported special case %X", patchDataOffset & 0x7F);
 				return;
 		}
 	}
@@ -1636,7 +1636,7 @@ int Resource::decompress(ResVersion volVersion, Common::SeekableReadStream *file
 		break;
 #endif
 	default:
-		warning("Resource %s: Compression method %d not supported", _id.toString().c_str(), compression);
+		error("Resource %s: Compression method %d not supported", _id.toString().c_str(), compression);
 		return SCI_ERROR_UNKNOWN_COMPRESSION;
 	}
 
@@ -1752,7 +1752,7 @@ ViewType ResourceManager::detectViewType() {
 		}
 	}
 
-	warning("resMan: Couldn't find any views");
+	error("resMan: Couldn't find any views");
 	return kViewUnknown;
 }
 
@@ -1862,7 +1862,7 @@ void ResourceManager::detectSciVersion() {
 				}
 			}
 
-			warning("Failed to accurately determine SCI version");
+			error("Failed to accurately determine SCI version");
 			// No parser, we assume SCI_VERSION_01.
 			s_sciVersion = SCI_VERSION_01;
 			return;
@@ -1919,7 +1919,7 @@ bool ResourceManager::detectHires() {
 		}
 	}
 
-	warning("resMan: Couldn't detect hires");
+	error("resMan: Couldn't detect hires");
 	return false;
 #else
 	error("no sci32 support");
@@ -1944,7 +1944,7 @@ bool ResourceManager::hasOldScriptHeader() {
 	Resource *res = findResource(ResourceId(kResourceTypeScript, 0), 0);
 
 	if (!res) {
-		warning("resMan: Failed to find script.000");
+		error("resMan: Failed to find script.000");
 		return false;
 	}
 
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 265d5dc151..b8c541fc03 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -365,7 +365,7 @@ bool SciEngine::initGame() {
 	_gamestate->stack_top = stack->_entries + stack->_capacity;
 
 	if (!script_instantiate(_resMan, _gamestate->_segMan, 0)) {
-		warning("initGame(): Could not instantiate script 0");
+		error("initGame(): Could not instantiate script 0");
 		return false;
 	}
 
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index fa215ac302..6b0a69f5b8 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -203,7 +203,7 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM
 		_cmdUpdateCuesIndex = 17;
 		break;
 	default:
-		warning("Sound command parser: unknown sound version %d", _soundVersion);
+		error("Sound command parser: unknown sound version %d", _soundVersion);
 		break;
 	}
 }
@@ -246,7 +246,7 @@ reg_t SoundCommandParser::parseCommand(int argc, reg_t *argv, reg_t acc) {
 
 		(this->*(_soundCommands[command]->sndCmd))(obj, value);
 	} else {
-		warning("Invalid sound command requested (%d), valid range is 0-%d", command, _soundCommands.size() - 1);
+		error("Invalid sound command requested (%d), valid range is 0-%d", command, _soundCommands.size() - 1);
 	}
 
 	return _acc;