[Scummvm-cvs-logs] scummvm master -> 710072c55bcdac525bea401a4c9fa260a95d79c5

[bluegr]

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:
710072c55b DREAMWEB: Fix regression in getOpenedSize()


Commit: 710072c55bcdac525bea401a4c9fa260a95d79c5
    https://github.com/scummvm/scummvm/commit/710072c55bcdac525bea401a4c9fa260a95d79c5
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-17T04:33:17-08:00

Commit Message:
DREAMWEB: Fix regression in getOpenedSize()

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 283e44b..d376f91 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -284,7 +284,26 @@ void DreamBase::getBackFromOb() {
 }
 
 void DreamGenContext::getOpenedSize() {
-	ax = getOpenedSizeCPP();
+	//ax = getOpenedSizeCPP();
+
+	// We need to call the ASM-style versions of get*Ad, as these also set
+	// bx and es
+
+	al = data.byte(kOpenedob);
+
+	switch (data.byte(kOpenedtype)) {
+	case 4:
+		getExAd();
+		break;
+	case 2:
+		getFreeAd();
+		break;
+	default:
+		getSetAd();
+		break;
+	}
+
+	ax = es.word(bx+7);
 }
 
 byte DreamGenContext::getOpenedSizeCPP() {