[Scummvm-cvs-logs] scummvm master -> bb14626630541c845e1cfea00cb6446562124ece

[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:
bb14626630 DREAMWEB: Finish off useObject()


Commit: bb14626630541c845e1cfea00cb6446562124ece
    https://github.com/scummvm/scummvm/commit/bb14626630541c845e1cfea00cb6446562124ece
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-06T07:55:08-08:00

Commit Message:
DREAMWEB: Finish off useObject()

Changed paths:
    engines/dreamweb/use.cpp



diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index e5a616e..96df77b 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -880,17 +880,11 @@ void DreamGenContext::useObject() {
 		commandWithOb(data.byte(kCommand), data.byte(kObjecttype), 51);
 	}
 
-alreadyuse:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (nouse) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto douse;
-	return;
-douse:
-	useRoutine();
+	if (data.word(kMousebutton) == data.word(kOldbutton))
+		return;	// nouse
+
+	if (data.word(kMousebutton) & 1)
+		useRoutine();
 }
 
 } /*namespace dreamgen */