[Scummvm-cvs-logs] scummvm master -> 759040d6793b1a2302f9150ae587634fbff25b91

fuzzie fuzzie at fuzzie.org
Thu Mar 31 22:41:17 CEST 2011


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
66269fa208 MOHAWK: Toggle the post-intro LB menu anim at the right time.
73c15cebe8 MOHAWK: Update LBAnimationItem running state when anim is done.
ab97a5e493 MOHAWK: Tweaks to LBAnimationItem::setEnabled.
759040d679 MOHAWK: Add/update some LB debug/warning stuff.


Commit: 66269fa2088a4f47f70b15e6c3c57006353b05d4
    https://github.com/scummvm/scummvm/commit/66269fa2088a4f47f70b15e6c3c57006353b05d4
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-31T13:35:40-07:00

Commit Message:
MOHAWK: Toggle the post-intro LB menu anim at the right time.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 553940d..6534f79 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -398,10 +398,6 @@ void MohawkEngine_LivingBooks::updatePage() {
 			// hard-coded control page startup
 			LBItem *item;
 
-			item = getItemById(10);
-			if (item)
-				item->togglePlaying(false);
-
 			uint16 page = _curPage;
 			if (getFeatures() & GF_LB_10) {
 				// Living Books 1.0 had the meanings of these pages reversed
@@ -493,6 +489,12 @@ void MohawkEngine_LivingBooks::updatePage() {
 		for (uint32 i = 0; i < _items.size(); i++)
 			_items[i]->startPhase(_phase);
 
+		if (_curMode == kLBControlMode) {
+			LBItem *item = getItemById(10);
+			if (item)
+				item->togglePlaying(false);
+		}
+
 		_phase++;
 		break;
 


Commit: 73c15cebe8b60dcc9289f5e3accb808153c01253
    https://github.com/scummvm/scummvm/commit/73c15cebe8b60dcc9289f5e3accb808153c01253
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-31T13:38:32-07:00

Commit Message:
MOHAWK: Update LBAnimationItem running state when anim is done.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 6534f79..6253d96 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -3503,8 +3503,10 @@ bool LBAnimationItem::contains(Common::Point point) {
 void LBAnimationItem::update() {
 	if (!_neverEnabled && _enabled && _globalEnabled && _running) {
 		bool wasDone = _anim->update();
-		if (wasDone)
+		if (wasDone) {
+			_running = false;
 			done(true);
+		}
 	}
 
 	LBItem::update();


Commit: ab97a5e493ba0f6fa9a4369bc445cb36ef8393cb
    https://github.com/scummvm/scummvm/commit/ab97a5e493ba0f6fa9a4369bc445cb36ef8393cb
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-31T13:39:17-07:00

Commit Message:
MOHAWK: Tweaks to LBAnimationItem::setEnabled.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 6253d96..a1bda0c 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -3479,12 +3479,10 @@ LBAnimationItem::~LBAnimationItem() {
 
 void LBAnimationItem::setEnabled(bool enabled) {
 	if (_running) {
-		if (enabled && _neverEnabled)
+		if (enabled && _globalEnabled && _neverEnabled)
 			_anim->start();
 		else if (!_neverEnabled && !enabled && _enabled && _globalEnabled)
-			if (_running) {
-				_anim->stop();
-			}
+			_anim->stop();
 	}
 
 	return LBItem::setEnabled(enabled);


Commit: 759040d6793b1a2302f9150ae587634fbff25b91
    https://github.com/scummvm/scummvm/commit/759040d6793b1a2302f9150ae587634fbff25b91
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-31T13:39:46-07:00

Commit Message:
MOHAWK: Add/update some LB debug/warning stuff.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index a1bda0c..74dbfb3 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -117,6 +117,9 @@ Common::Error MohawkEngine_LivingBooks::run() {
 		debug("Starting Living Books Title \'%s\'", _title.c_str());
 	if (!_copyright.empty())
 		debug("Copyright: %s", _copyright.c_str());
+	debug("This book has %d pages in %d languages.", _numPages, _numLanguages);
+	if (_poetryMode)
+		debug("Running in poetry mode.");
 
 	if (!_screenWidth || !_screenHeight)
 		error("Could not find xRes/yRes variables");
@@ -1360,8 +1363,9 @@ NodeState LBAnimationNode::update(bool seeking) {
 			assert(entry.size == 4);
 			uint16 strLen = READ_BE_UINT16(entry.data + 2);
 
-			if (strLen)
-				warning("Named wave file encountered");
+			if (strLen) {
+				warning("Named wave file encountered (strlen %04x, id %d)", strLen, soundResourceId);
+			}
 
 			switch (entry.opcode) {
 			case kLBAnimOpPlaySound:






More information about the Scummvm-git-logs mailing list