DREAMWEB: Port 'showslots' to C++

5 files changed, 16 insertions, 36 deletions

diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index c68483fc77..8b61fc5017 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -765,6 +765,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'showryanpage',
 	'showsaveops',
 	'showseconduse',
+	'showslots',
 	'showsymbol',
 	'showtime',
 	'showwatch',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ddc599f7e8..b756c39bbf 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3004,39 +3004,6 @@ gotkeyp:
 	showDiaryPage();
 }
 
-void DreamGenContext::showSlots() {
-	STACK_CHECK;
-	di = (60)+7;
-	bx = (52)+8;
-	al = 2;
-	ds = data.word(kTempgraphics);
-	ah = 0;
-	showFrame();
-	di = (60)+10;
-	bx = (52)+11;
-	cl = 0;
-slotloop:
-	push(cx);
-	push(di);
-	push(bx);
-	_cmp(cl, data.byte(kCurrentslot));
-	if (!flags.z())
-		goto nomatchslot;
-	al = 3;
-	ds = data.word(kTempgraphics);
-	ah = 0;
-	showFrame();
-nomatchslot:
-	bx = pop();
-	di = pop();
-	cx = pop();
-	_add(bx, 10);
-	_inc(cl);
-	_cmp(cl, 7);
-	if (!flags.z())
-		goto slotloop;
-}
-
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 5273270ce5..05e7c856df 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -479,7 +479,7 @@ public:
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
-	void showSlots();
+	void fillOpen();
 	void useCashCard();
 	void moneyPoke();
 	void doSomeTalk();
@@ -518,7 +518,6 @@ public:
 	void rollEm();
 	void lookAtPlace();
 	void findAllOpen();
-	void fillOpen();
 	void deleteExObject();
 	void getEitherAd();
 	void setPickup();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2279d9ffbe..fb5fba8d9c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3927,7 +3927,6 @@ void DreamGenContext::talk() {
 	}
 }
 
-
 void DreamGenContext::discOps() {
 	if (data.byte(kCommandtype) != 249) {
 		data.byte(kCommandtype) = 249;
@@ -4564,4 +4563,17 @@ void DreamGenContext::lookAtCard() {
 	putBackObStuff();
 }
 
+void DreamGenContext::showSlots() {
+	showFrame(tempGraphics(), kOpsx + 7, kOpsy + 8, 2, 0);
+
+	uint16 y = kOpsy + 11;
+
+	for (int slot = 0; slot < 7; slot++) {
+		if (slot == data.byte(kCurrentslot))
+			showFrame(tempGraphics(), kOpsx + 10, y, 3, 0);
+
+		y += 10;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6140f3d0d4..741abd807f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -393,5 +393,6 @@
 	void notHeldError();
 	void useGun();
 	void identifyOb();
+	void showSlots();
 
 #endif