[Scummvm-cvs-logs] SF.net SVN: scummvm:[55446] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 55446
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55446&view=rev
Author:   fuzzie
Date:     2011-01-22 21:22:29 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
MOHAWK: Minor CSTimeChar bugfixes.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/cstime.cpp
    scummvm/trunk/engines/mohawk/cstime_game.cpp

Modified: scummvm/trunk/engines/mohawk/cstime.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime.cpp	2011-01-22 21:22:12 UTC (rev 55445)
+++ scummvm/trunk/engines/mohawk/cstime.cpp	2011-01-22 21:22:29 UTC (rev 55446)
@@ -424,9 +424,8 @@
 	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;
 		}
 

Modified: scummvm/trunk/engines/mohawk/cstime_game.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime_game.cpp	2011-01-22 21:22:12 UTC (rev 55445)
+++ scummvm/trunk/engines/mohawk/cstime_game.cpp	2011-01-22 21:22:29 UTC (rev 55446)
@@ -171,7 +171,7 @@
 		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 @@
 		_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);
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.