[Scummvm-cvs-logs] SF.net SVN: scummvm: [26773] scummvm/trunk/engines/agos/icons.cpp

[kirben at users.sourceforge.net]

Revision: 26773
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26773&view=rev
Author:   kirben
Date:     2007-05-06 23:30:51 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Fix inventory movement in Elvira 1/2 and Waxworks.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/icons.cpp

Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp	2007-05-07 06:18:08 UTC (rev 26772)
+++ scummvm/trunk/engines/agos/icons.cpp	2007-05-07 06:30:51 UTC (rev 26773)
@@ -396,6 +396,9 @@
 	if (getGameType() == GType_SIMON2) {
 		width = 100;
 		height = 40;
+	} else if (getGameType() == GType_WW) {
+		width = window->width / 3;
+		height = window->height / 2;
 	} else {
 		width = window->width / 3;
 		height = window->height / 3;
@@ -446,7 +449,7 @@
 					drawIcon(window, itemGetIconNumber(itemRef), x_pos, y_pos);
 					window->iconPtr->iconArray[k].boxCode =
 						setupIconHitArea(window, 0, x_pos, y_pos, itemRef);
-				} else if (getGameType() == GType_SIMON1) {
+				} else if (getGameType() == GType_SIMON1 || getGameType() == GType_WW) {
 					drawIcon(window, itemGetIconNumber(itemRef), x_pos * 3, y_pos);
 					window->iconPtr->iconArray[k].boxCode =
 						setupIconHitArea(window, 0, x_pos * 3, y_pos, itemRef);
@@ -707,7 +710,7 @@
 	ha->width = 9;
 	ha->height = 11;
 	ha->flags = kBFBoxInUse | kBFNoTouchName;
-	ha->id = 0x7FFB;
+	ha->id = 0x7FFC;
 	ha->priority = 100;
 	ha->window = window;
 	ha->verb = 1;
@@ -739,7 +742,7 @@
 	ha->width = 12;
 	ha->height = 10;
 	ha->flags = kBFBoxInUse;
-	ha->id = 0x7FFB;
+	ha->id = 0x7FFC;
 	ha->priority = 100;
 	ha->window = window;
 	ha->verb = 1;
@@ -770,7 +773,7 @@
 	ha->width = 16;
 	ha->height = 19;
 	ha->flags = kBFBoxInUse;
-	ha->id = 0x7FFB;
+	ha->id = 0x7FFC;
 	ha->priority = 100;
 	ha->window = window;
 	ha->verb = 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.