[Scummvm-cvs-logs] SF.net SVN: scummvm: [29612] scummvm/trunk/engines/agi

[thebluegr at users.sourceforge.net]

Revision: 29612
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29612&view=rev
Author:   thebluegr
Date:     2007-11-22 12:54:46 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
Objects in Mickey's Space Adventure are shown correctly now

Modified Paths:
--------------
    scummvm/trunk/engines/agi/picture.cpp
    scummvm/trunk/engines/agi/preagi_mickey.cpp

Modified: scummvm/trunk/engines/agi/picture.cpp
===================================================================
--- scummvm/trunk/engines/agi/picture.cpp	2007-11-22 14:04:46 UTC (rev 29611)
+++ scummvm/trunk/engines/agi/picture.cpp	2007-11-22 20:54:46 UTC (rev 29612)
@@ -228,6 +228,9 @@
 INLINE int PictureMgr::isOkFillHere(int x, int y) {
 	uint8 p;
 
+	x += _xOffset;
+	y += _yOffset;
+
 	if (x < 0 || x >= _width || y < 0 || y >= _height)
 		return false;
 

Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-11-22 14:04:46 UTC (rev 29611)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-11-22 20:54:46 UTC (rev 29612)
@@ -664,14 +664,6 @@
 
 	if (iObj == IDI_MSA_OBJECT_CRYSTAL)
 		_vm->_picture->setPictureFlags(kPicFStep);
-
-	// HACK: attempting to draw the scale in Mickey's house causes a crash, so we don't draw it
-	if (iObj == IDI_MSA_OBJECT_SCALE)
-		return;
-
-	// HACK: attempting to draw the rock in Jupiter causes a crash, so we don't draw it
-	if (iObj == IDI_MSA_OBJECT_ROCK_1 || iObj == IDI_MSA_OBJECT_ROCK_2 || iObj == IDI_MSA_OBJECT_ROCK_3)
-		return;
 	
 	_vm->_picture->setOffset(x0, y0);
 	_vm->_picture->decodePicture(buffer, size, false, IDI_MSA_PIC_WIDTH, IDI_MSA_PIC_HEIGHT);


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