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

wjp wjp at usecode.org
Tue Nov 15 10:28:38 CET 2011


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:
c2ec285175 DREAMWEB: Fix regression in obicons


Commit: c2ec2851753ad7c65308108cecc5f652915a990f
    https://github.com/scummvm/scummvm/commit/c2ec2851753ad7c65308108cecc5f652915a990f
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-15T01:27:49-08:00

Commit Message:
DREAMWEB: Fix regression in obicons

This fixes the 'use' icon on the winch controls.
Regression from 1f531c6f7fc90d78a4d14cda377e5aed7c7f4eb0.
Thanks to fuzzie for spotting it.

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 2712bc9..277ad20 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -103,11 +103,12 @@ void DreamGenContext::obpicture() {
 void DreamGenContext::obicons() {
 	uint8 value1, value2;
 	getanyad(&value1, &value2);
-	if (value1 == 0xff) {
-		showframe((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 260, 1, 1, 0);
-	} else {
+	if (value1 != 0xff) {
+		// can open it
 		showframe((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 210, 1, 4, 0);
 	}
+
+	showframe((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 260, 1, 1, 0);
 }
 
 void DreamGenContext::examineob(bool examineAgain) {






More information about the Scummvm-git-logs mailing list