From 3b9b4cb6ba72a93359523a9b7c3c115db3d0aed2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 16:52:31 +0200
Subject: DREAMWEB: Fix a regression in fillOpen() and remove the now unused
 getOpenedSize()

---
 engines/dreamweb/object.cpp | 27 +--------------------------
 engines/dreamweb/stubs.h    |  1 -
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index c8127c345e..a7a7814db3 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -276,31 +276,6 @@ void DreamBase::getBackFromOb() {
 		blank();
 }
 
-void DreamGenContext::getOpenedSize() {
-	//ah = getOpenedSlotSize();
-	//ah = getOpenedSlotCount();
-
-	// 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();
-		ax = es.word(bx+7);
-		break;
-	case 2:
-		getFreeAd();
-		ax = es.word(bx+7);
-		break;
-	default:
-		getSetAd();
-		ax = es.word(bx+3);
-		break;
-	}
-}
-
 byte DreamBase::getOpenedSlotCount() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
@@ -1092,7 +1067,7 @@ void DreamBase::fillOpen() {
 	for (uint8 i = 0; i < size; ++i) {
 		uint8 index = openInvList[2*i]; 
 		uint8 type = openInvList[2*i + 1];
-		obToInv(index, type, kInventx + (i-1)*kItempicsize, kInventy + 96);
+		obToInv(index, type, kInventx + i * kItempicsize, kInventy + 96);
 	}
 	underTextLine();
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bd5cd9d1e5..9ab025fb3e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -118,7 +118,6 @@
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	bool execCommand();
-	void getOpenedSize();
 	bool checkObjectSizeCPP();
 	void identifyOb();
 	void selectOb();
-- 
cgit v1.2.3