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

[fuzzie at users.sourceforge.net]

Revision: 54791
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54791&view=rev
Author:   fuzzie
Date:     2010-12-05 22:10:20 +0000 (Sun, 05 Dec 2010)

Log Message:
-----------
MOHAWK: handle -1 phase for LB 2/3 items

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

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-05 22:10:00 UTC (rev 54790)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-05 22:10:20 UTC (rev 54791)
@@ -335,6 +335,9 @@
 	switch (_phase) {
 	case 0:
 		for (uint32 i = 0; i < _items.size(); i++)
+			_items[i]->startPhase(0xFFFF);
+
+		for (uint32 i = 0; i < _items.size(); i++)
 			_items[i]->startPhase(_phase);
 
 		if (_curMode == kLBControlMode) {
@@ -1730,6 +1733,7 @@
 		if (size != 2)
 			error("SetPlayPhase had wrong size (%d)", size);
 		_phase = stream->readUint16();
+		debug(2, "kLBSetPlayPhase: %d", _phase);
 		break;
 
 	case kLBUnknown6F:
@@ -1964,8 +1968,19 @@
 		setEnabled(true);
 
 	switch (phase) {
+	case 0xFFFF:
+		runScript(kLBActionPrePhase);
+		if (_timingMode == 6) {
+			debug(2, "Phase -1 time startup");
+			setNextTime(_periodMin, _periodMax);
+		}
+		break;
 	case 0:
 		runScript(kLBActionPhase0);
+		if (_timingMode == 5) {
+			debug(2, "Phase 0 time startup");
+			setNextTime(_periodMin, _periodMax);
+		}
 		break;
 	case 1:
 		runScript(kLBActionPhase1);

Modified: scummvm/trunk/engines/mohawk/livingbooks.h
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.h	2010-12-05 22:10:00 UTC (rev 54790)
+++ scummvm/trunk/engines/mohawk/livingbooks.h	2010-12-05 22:10:20 UTC (rev 54791)
@@ -91,7 +91,9 @@
 	kLBActionStarted = 3,
 	kLBActionDone = 4,
 	kLBActionMouseUp = 5,
-	kLBActionPhase2 = 6
+	kLBActionPhase2 = 6,
+	kLBActionNotified = 7,
+	kLBActionPrePhase = 0xff
 };
 
 enum {


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