[Scummvm-cvs-logs] scummvm master -> 341a2d68742d4c7dce9229c1da4c8e6b13e2087c

[wjp]

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

Summary:
341a2d6874 DREAMWEB: Fix regression in deleteExObject


Commit: 341a2d68742d4c7dce9229c1da4c8e6b13e2087c
    https://github.com/scummvm/scummvm/commit/341a2d68742d4c7dce9229c1da4c8e6b13e2087c
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-20T05:07:01-08:00

Commit Message:
DREAMWEB: Fix regression in deleteExObject

(thanks to Fingolfin)

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 7048140..5497930 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -535,7 +535,7 @@ void DreamBase::deleteExObject(uint8 index) {
 	deleteExText(index);
 
 	for (uint8 i = 0; i < kNumexobjects; ++i) {
-		DynObject *t = getExAd(index);
+		DynObject *t = getExAd(i);
 		// Is this object contained in the one we've just deleted?
 		if (t->mapad[0] == 4 && t->mapad[1] == index)
 			deleteExObject(i);
@@ -544,7 +544,7 @@ void DreamBase::deleteExObject(uint8 index) {
 
 void DreamBase::removeObFromInv() {
 	if (data.byte(kCommand) == 100)
-		return; // object doesn't exit
+		return; // object doesn't exist
 
 	assert(data.byte(kObjecttype) == kExObjectType);