[Scummvm-cvs-logs] scummvm master -> bd526aac1dc64ead135b42b08e46566636ba5a90

[fuzzie]

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:
86fcca5a87 MOHAWK: comment text after #endif
9bf0800032 MOHAWK: Fix LB debug message to use the right name.
ad7b6f6817 MOHAWK: Don't fail to delete consecutive items.
bd526aac1d MOHAWK: Destroying an LBGroupItem destroys the whole group.


Commit: 86fcca5a878fa464f4b5751fa5fb9ad0a7d69f9e
    https://github.com/scummvm/scummvm/commit/86fcca5a878fa464f4b5751fa5fb9ad0a7d69f9e
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T06:06:46-07:00

Commit Message:
MOHAWK: comment text after #endif

Changed paths:
    engines/mohawk/graphics.h



diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h
index 1331508..5cac68c 100644
--- a/engines/mohawk/graphics.h
+++ b/engines/mohawk/graphics.h
@@ -241,7 +241,7 @@ private:
 	uint _creditsImage, _creditsPos;
 };
 
-#endif ENABLE_RIVEN
+#endif // ENABLE_RIVEN
 
 class LBGraphics : public GraphicsManager {
 public:


Commit: 9bf08000323515b300bf7e267f9523c994b0383b
    https://github.com/scummvm/scummvm/commit/9bf08000323515b300bf7e267f9523c994b0383b
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T06:07:45-07:00

Commit Message:
MOHAWK: Fix LB debug message to use the right name.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index b25a1a7..8f497cb 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -2404,7 +2404,7 @@ void LBItem::runScriptEntry(LBScriptEntry *entry) {
 				debug(2, "Target %04x (%04x) doesn't exist, skipping", targetId, param);
 				continue;
 			}
-			debug(2, "Target: %04x (%04x) '%s'", targetId, param, _desc.c_str());
+			debug(2, "Target: %04x (%04x) '%s'", targetId, param, target->_desc.c_str());
 		} else {
 			target = this;
 			debug(2, "Self-target on '%s'", _desc.c_str());


Commit: ad7b6f68173db0ecb6d5a7925770c423874ded8b
    https://github.com/scummvm/scummvm/commit/ad7b6f68173db0ecb6d5a7925770c423874ded8b
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T06:08:21-07:00

Commit Message:
MOHAWK: Don't fail to delete consecutive items.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 8f497cb..9dd5c9c 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -498,6 +498,7 @@ void MohawkEngine_LivingBooks::updatePage() {
 			switch (delayedEvent.type) {
 			case kLBDelayedEventDestroy:
 				_items.remove_at(i);
+				i--;
 				delete delayedEvent.item;
 				if (_focus == delayedEvent.item)
 					_focus = NULL;


Commit: bd526aac1dc64ead135b42b08e46566636ba5a90
    https://github.com/scummvm/scummvm/commit/bd526aac1dc64ead135b42b08e46566636ba5a90
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-03-29T06:09:15-07:00

Commit Message:
MOHAWK: Destroying an LBGroupItem destroys the whole group.

Changed paths:
    engines/mohawk/livingbooks.cpp
    engines/mohawk/livingbooks.h



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 9dd5c9c..bd2891e 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -2909,6 +2909,16 @@ void LBGroupItem::readData(uint16 type, uint16 size, Common::SeekableSubReadStre
 	}
 }
 
+void LBGroupItem::destroySelf() {
+	LBItem::destroySelf();
+
+	for (uint i = 0; i < _groupEntries.size(); i++) {
+		LBItem *item = _vm->getItemById(_groupEntries[i].entryId);
+		if (item)
+			item->destroySelf();
+	}
+}
+
 void LBGroupItem::setEnabled(bool enabled) {
 	if (_starting) {
 		_starting = false;
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 6c22187..3cd9142 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -424,6 +424,7 @@ public:
 
 	void readData(uint16 type, uint16 size, Common::SeekableSubReadStreamEndian *stream);
 
+	void destroySelf();
 	void setEnabled(bool enabled);
 	void setGlobalEnabled(bool enabled);
 	bool contains(Common::Point point);