DREAMWEB: Convert 'inventory'

1 files changed, 18 insertions, 99 deletions

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 446278252c..1e5646d340 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -180,33 +180,23 @@ void DreamGenContext::examineob(bool examineAgain) {
 }
 
 void DreamGenContext::inventory() {
-	STACK_CHECK;
-	_cmp(data.byte(kMandead), 1);
-	if (flags.z())
-		goto iswatchinv;
-	_cmp(data.word(kWatchingtime), 0);
-	if (flags.z())
-		goto notwatchinv;
-iswatchinv:
-	blank();
-	return;
-notwatchinv:
-	_cmp(data.byte(kCommandtype), 239);
-	if (flags.z())
-		goto alreadyopinv;
-	data.byte(kCommandtype) = 239;
-	al = 32;
-	commandonly();
-alreadyopinv:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (cantopinv) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doopeninv;
-	return;
-doopeninv:
+	if (data.byte(kMandead) == 1 || data.word(kWatchingtime) != 0) {
+		blank();
+		return;
+	}
+
+	if (data.byte(kCommandtype) != 239) {
+		data.byte(kCommandtype) = 239;
+		al = 32;
+		commandonly();
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton))
+		return;
+	if (!(data.word(kMousebutton) & 1)) // only on left mouse button
+		return;
+
+
 	data.word(kTimecount) = 0;
 	data.byte(kPointermode) = 0;
 	data.byte(kInmaparea) = 0;
@@ -225,78 +215,7 @@ doopeninv:
 	worktoscreen();
 	delpointer();
 	data.byte(kOpenedob) = 255;
-	goto waitexam;
-	return;
-/*continuing to unbounded code: examineagain from examineob:3-69*/
-examineagain:
-	data.byte(kInmaparea) = 0;
-	data.byte(kExamagain) = 0;
-	data.byte(kOpenedob) = 255;
-	data.byte(kOpenedtype) = 255;
-	data.byte(kInvopen) = 0;
-	al = data.byte(kCommandtype);
-	data.byte(kObjecttype) = al;
-	data.byte(kItemframe) = 0;
-	data.byte(kPointerframe) = 0;
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	obicons();
-	obpicture();
-	describeob();
-	undertextline();
-	data.byte(kCommandtype) = 255;
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
-waitexam:
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
-	delpointer();
-	data.byte(kGetback) = 0;
-	bx = offset_examlist;
-	_cmp(data.byte(kInvopen), 0);
-	if (flags.z())
-		goto notuseinv;
-	bx = offset_invlist1;
-	_cmp(data.byte(kInvopen), 1);
-	if (flags.z())
-		goto notuseinv;
-	bx = offset_withlist1;
-notuseinv:
-	checkcoords();
-	_cmp(data.byte(kQuitrequested),  0);
-	if (!flags.z())
-		goto stopwaiting;
-	_cmp(data.byte(kExamagain), 0);
-	if (flags.z())
-		goto norex;
-	goto examineagain;
-norex:
-	_cmp(data.byte(kGetback), 0);
-	if (flags.z())
-		goto waitexam;
-stopwaiting:
-	data.byte(kPickup) = 0;
-	_cmp(data.word(kWatchingtime), 0);
-	if (!flags.z())
-		goto iswatching;
-	_cmp(data.byte(kNewlocation), 255);
-	if (!flags.z())
-		goto justgetback;
-iswatching:
-	makemainscreen();
-	data.byte(kInvopen) = 0;
-	data.byte(kOpenedob) = 255;
-	return;
-justgetback:
-	data.byte(kInvopen) = 0;
-	data.byte(kOpenedob) = 255;
+	examineob(false);
 }