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

[Kirben at users.sourceforge.net]

Revision: 43152
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43152&view=rev
Author:   Kirben
Date:     2009-08-09 01:20:08 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
Fix bug #2834254 - ELVIRA: Buggy scroll arrows when mixing spells.

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

Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp	2009-08-09 01:09:31 UTC (rev 43151)
+++ scummvm/trunk/engines/agos/icons.cpp	2009-08-09 01:20:08 UTC (rev 43152)
@@ -860,16 +860,16 @@
 	x = 30;
 	y = 151;
 	if (num != 2) {
-		y = window->height * 4 + window->y - 19;
-		x = window->width + window->x;
+		y = window->y + window->height * 4 - 19;
+		x = window->x + window->width;
 	}
 	drawArrow(x, y, 16);
 
 	ha = findEmptyHitArea();
 	_scrollUpHitArea = ha - _hitAreas;
 
-	ha->x = 30 * 8;
-	ha->y = 151;
+	ha->x = x * 8;
+	ha->y = y;
 	ha->width = 16;
 	ha->height = 19;
 	ha->flags = kBFBoxInUse;
@@ -881,16 +881,16 @@
 	x = 30;
 	y = 170;
 	if (num != 2) {
-		y = window->height * 4;
-		x = window->width + window->x;
+		y = window->y + window->height * 4;
+		x = window->x + window->width;
 	}
 	drawArrow(x, y, -16);
 
 	ha = findEmptyHitArea();
 	_scrollDownHitArea = ha - _hitAreas;
 
-	ha->x = 30 * 8;
-	ha->y = 170;
+	ha->x = x * 8;
+	ha->y = y;
 	ha->width = 16;
 	ha->height = 19;
 	ha->flags = kBFBoxInUse;
@@ -956,7 +956,8 @@
 
 	for (h = 0; h < 19; h++) {
 		for (w = 0; w < 16; w++) {
-			dst[w] = src[w] + 16;
+			if (src[w]) 
+				dst[w] = src[w] + 16;
 		}
 
 		src += dir;

Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp	2009-08-09 01:09:31 UTC (rev 43151)
+++ scummvm/trunk/engines/agos/saveload.cpp	2009-08-09 01:20:08 UTC (rev 43152)
@@ -269,6 +269,7 @@
 			in->read(dst, 8);
 			delete in;
 
+			printf("Find: name %s file %s\n", name, (const char *)dst);
 			if (!scumm_stricmp(name, dst)) {
 				return slot;
 			}


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