diff options
| author | Filippos Karapetis | 2010-06-17 23:45:38 +0000 | 
|---|---|---|
| committer | Filippos Karapetis | 2010-06-17 23:45:38 +0000 | 
| commit | 9c1ec81d76def56d55df701df9d158532da1bf0f (patch) | |
| tree | 18bea94eb7d3272529d010775868153df1ab126b /engines/sci/engine | |
| parent | f977faaf9f9d2289adfbc2ccf9338cb24266dce5 (diff) | |
| download | scummvm-rg350-9c1ec81d76def56d55df701df9d158532da1bf0f.tar.gz scummvm-rg350-9c1ec81d76def56d55df701df9d158532da1bf0f.tar.bz2 scummvm-rg350-9c1ec81d76def56d55df701df9d158532da1bf0f.zip  | |
Strict mode: Turned several severe errors (almost all detection related) into errors, instead of warnings
svn-id: r49972
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/features.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/message.cpp | 6 | 
3 files changed, 8 insertions, 8 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)  | 
