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

[fuzzie at users.sourceforge.net]

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

Log Message:
-----------
MOHAWK: Implement kCSTimeEventCharSomeNIS55.

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

Modified: scummvm/trunk/engines/mohawk/cstime.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cstime.cpp	2011-01-22 19:37:25 UTC (rev 55444)
+++ scummvm/trunk/engines/mohawk/cstime.cpp	2011-01-22 21:22:12 UTC (rev 55445)
@@ -310,6 +310,24 @@
 			}
 			break;
 
+		case kCSTimeEventCharSomeNIS55:
+			// This is like kCSTimeEventCharPlayNIS, only using a different flag variable.
+			if (_processingNIS55) {
+				CSTimeChar *chr = _case->getCurrScene()->getChar(event.param1);
+				if (chr->NISIsDone()) {
+					chr->removeNIS();
+					_processingNIS55 = false;
+					chr->setupAmbientAnims(true);
+					_events.pop_front();
+					processEvent = false;
+				} else {
+					done = true;
+				}
+			} else {
+				advanceQueue = false;
+			}
+			break;
+
 		default:
 			break;
 		}
@@ -350,6 +368,7 @@
 
 void MohawkEngine_CSTime::reset() {
 	_NISRunning = false;
+	_processingNIS55 = false;
 	_lastTimeout = 0xffffffff;
 	_processingEvent = false;
 }
@@ -531,6 +550,11 @@
 		// FIXME
 		break;
 
+	case kCSTimeEventCharSomeNIS55:
+		_processingNIS55 = true;
+		_case->getCurrScene()->getChar(event.param1)->playNIS(event.param2);
+		break;
+
 	case kCSTimeEventUpdateBubble:
 		switch (event.param2) {
 		case 0:

Modified: scummvm/trunk/engines/mohawk/cstime.h
===================================================================
--- scummvm/trunk/engines/mohawk/cstime.h	2011-01-22 19:37:25 UTC (rev 55444)
+++ scummvm/trunk/engines/mohawk/cstime.h	2011-01-22 21:22:12 UTC (rev 55445)
@@ -178,6 +178,7 @@
 	uint16 _nextSceneId;
 
 	bool _processingEvent;
+	bool _processingNIS55;
 	bool _NISRunning;
 	uint32 _lastTimeout;
 	void reset();


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