From bbfbb7e74a8a5db2a808e03df8076125371300f7 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Sat, 22 Jan 2011 21:22:29 +0000
Subject: MOHAWK: Minor CSTimeChar bugfixes.

svn-id: r55446
---
 engines/mohawk/cstime.cpp      | 5 ++---
 engines/mohawk/cstime_game.cpp | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'engines/mohawk')

diff --git a/engines/mohawk/cstime.cpp b/engines/mohawk/cstime.cpp
index 44c61176be..f4eeb99020 100644
--- a/engines/mohawk/cstime.cpp
+++ b/engines/mohawk/cstime.cpp
@@ -424,9 +424,8 @@ void MohawkEngine_CSTime::triggerEvent(CSTimeEvent &event) {
 	case kCSTimeEventCharStartFlapping:
 		{
 		CSTimeChar *chr = _case->getCurrScene()->getChar(event.param1);
-		if (!chr->_enabled) {
-			// FIXME
-			warning("chr not enabled in kCSTimeEventCharStartFlapping");
+		if (!chr->_unknown2) {
+			_case->getCurrScene()->_activeChar->_flappingState = 0;
 			break;
 		}
 
diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp
index 05f2c36125..5dfc9c4cf6 100644
--- a/engines/mohawk/cstime_game.cpp
+++ b/engines/mohawk/cstime_game.cpp
@@ -171,7 +171,7 @@ void CSTimeChar::setupRestPos() {
 		return;
 
 	if (!_restFeature) {
-		uint id = 0; // FIXME
+		uint id = _enabled ? 0 : 13;
 		uint32 flags = kFeatureSortStatic | kFeatureNewNoLoop | kFeatureNewDisableOnReset;
 		Feature *feature = _vm->getView()->installViewFeature(getChrBaseId() + id, flags, NULL);
 		// FIXME: fix priorities
@@ -192,7 +192,7 @@ void CSTimeChar::removeChr() {
 		_vm->getView()->removeFeature(_talkFeature3, true);
 		if (_talkFeature1)
 			_vm->getView()->removeFeature(_talkFeature1, true);
-		if (_unknown1 > 1)
+		if (_talkFeature2) // original checks unknown1 > 1, but this is silly when e.g. _enabled is false
 			_vm->getView()->removeFeature(_talkFeature2, true);
 	}
 
-- 
cgit v1.2.3