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

fuzzie at users.sourceforge.net fuzzie at users.sourceforge.net
Wed Dec 1 19:21:33 CET 2010


Revision: 54708
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54708&view=rev
Author:   fuzzie
Date:     2010-12-01 18:21:33 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
MOHAWK: rename DelayedEventType values

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-01 18:21:17 UTC (rev 54707)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-01 18:21:33 UTC (rev 54708)
@@ -445,16 +445,16 @@
 				continue;
 
 			switch (delayedEvent.type) {
-			case kLBDestroy:
+			case kLBEventDestroy:
 				_items.remove_at(i);
 				delete delayedEvent.item;
 				if (_focus == delayedEvent.item)
 					_focus = NULL;
 				break;
-			case kLBSetNotVisible:
+			case kLBEventSetNotVisible:
 				_items[i]->setVisible(false);
 				break;
-			case kLBDone:
+			case kLBEventDone:
 				_items[i]->done(true);
 				break;
 			}
@@ -1623,7 +1623,7 @@
 	if (!this->_itemId)
 		error("destroySelf() on an item which was already dead");
 
-	_vm->queueDelayedEvent(DelayedEvent(this, kLBDestroy));
+	_vm->queueDelayedEvent(DelayedEvent(this, kLBEventDestroy));
 
 	_itemId = 0;
 }
@@ -1684,7 +1684,7 @@
 
 bool LBItem::togglePlaying(bool playing, bool restart) {
 	if (playing) {
-		_vm->queueDelayedEvent(DelayedEvent(this, kLBDone));
+		_vm->queueDelayedEvent(DelayedEvent(this, kLBEventDone));
 		return true;
 	}
 	if (!_neverEnabled && _enabled && !_playing) {
@@ -1847,7 +1847,8 @@
 				case 1:
 					// TODO: should be setVisible(true) - not a delayed event -
 					// when we're doing the param 1/2/3 stuff above?
-					_vm->queueDelayedEvent(DelayedEvent(this, kLBSetNotVisible));
+					// and in modern LB this is perhaps just a direct target->setVisible(true)..
+					_vm->queueDelayedEvent(DelayedEvent(this, kLBEventSetNotVisible));
 					break;
 
 				case 2:

Modified: scummvm/trunk/engines/mohawk/livingbooks.h
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.h	2010-12-01 18:21:17 UTC (rev 54707)
+++ scummvm/trunk/engines/mohawk/livingbooks.h	2010-12-01 18:21:33 UTC (rev 54708)
@@ -384,9 +384,9 @@
 };
 
 enum DelayedEventType {
-	kLBDestroy = 0,
-	kLBSetNotVisible = 1,
-	kLBDone = 2
+	kLBEventDestroy = 0,
+	kLBEventSetNotVisible = 1,
+	kLBEventDone = 2
 };
 
 struct DelayedEvent {


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




More information about the Scummvm-git-logs mailing list