NEVERHOOD: More work on Klayman (still eye cancerous code)

- Start to implement KmScene1001
- Implement queryPositionSprite and queryPositionRectList
- Implement message list related code (setting and running them)
- Access to message params now with accessors (so compatible types can be converted)

1 files changed, 27 insertions, 3 deletions

diff --git a/engines/neverhood/sprite.cpp b/engines/neverhood/sprite.cpp
index ce21527384..d9257502a0 100644
--- a/engines/neverhood/sprite.cpp
+++ b/engines/neverhood/sprite.cpp
@@ -384,7 +384,7 @@ void AnimatedSprite::updateFrameIndex() {
 }
 
 void AnimatedSprite::updateFrameInfo() {
-	debug("AnimatedSprite::updateFrameInfo()");
+	debug(8, "AnimatedSprite::updateFrameInfo()");
 
 	const AnimFrameInfo &frameInfo = _animResource.getFrameInfo(_frameIndex);
 	
@@ -452,20 +452,44 @@ void AnimatedSprite::setFileHash3(uint32 fileHash2, uint32 fileHash6, uint32 fil
 	_hashListIndex = -1;
 }
 
+void AnimatedSprite::setCallback1(AnimationCb callback1) {
+	if (_callback1Cb) {
+		(this->*_callback1Cb)();
+	}
+	SetAnimationCallback1(callback1);
+}
+
+void AnimatedSprite::setCallback2(AnimationCb callback2) {
+
+	if (_callback1Cb) {
+		// _callback1Cb has to be cleared before it's called
+		AnimationCb cb = _callback1Cb;
+		_callback1Cb = NULL;
+		(this->*cb)();
+	}
+
+	// TODO _callbackList = NULL;
+	_callback3Cb = NULL;
+	_callback2Cb = callback2;
+	
+	if (_callback2Cb) {
+		(this->*_callback2Cb)();
+	}
+
+}
+
 void AnimatedSprite::removeCallbacks() {
 
 	if (_callback1Cb) {
 		// _callback1Cb has to be cleared before it's called
 		AnimationCb cb = _callback1Cb;
 		_callback1Cb = NULL;
-		debug("Fire _callback1Cb");
 		(this->*cb)();
 	}
 
 	if (_callback3Cb) {
 		_callback2Cb = _callback3Cb;
 		_callback3Cb = NULL;
-		debug("Fire _callback3Cb");
 		(this->*_callback2Cb)();
 #if 0 // TODO		
 	} else if (_callbackList) {