[Scummvm-cvs-logs] SF.net SVN: scummvm:[51952] scummvm/trunk/engines/sci/graphics/animate.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue Aug 10 17:54:34 CEST 2010


Revision: 51952
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51952&view=rev
Author:   m_kiewitz
Date:     2010-08-10 15:54:34 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
SCI: add scaling support to kAddToPic

fixes laurabow2 bug #3041226

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/animate.cpp

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-10 15:18:18 UTC (rev 51951)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-08-10 15:54:34 UTC (rev 51952)
@@ -533,11 +533,8 @@
 		// Get the corresponding view
 		view = _cache->getView(it->viewId);
 
-		// Create rect according to coordinates and given cel
-		view->getCelRect(it->loopNo, it->celNo, it->x, it->y, it->z, it->celRect);
-
 		// draw corresponding cel
-		_paint16->drawCel(it->viewId, it->loopNo, it->celNo, it->celRect, it->priority, it->paletteNo);
+		_paint16->drawCel(it->viewId, it->loopNo, it->celNo, it->celRect, it->priority, it->paletteNo, it->scaleX, it->scaleY);
 		if ((it->signal & kSignalIgnoreActor) == 0) {
 			it->celRect.top = CLIP<int16>(_ports->kernelPriorityToCoordinate(it->priority) - 1, it->celRect.top, it->celRect.bottom - 1);
 			_paint16->fillRect(it->celRect, GFX_SCREEN_MASK_CONTROL, 0, 0, 15);
@@ -681,6 +678,7 @@
 
 void GfxAnimate::kernelAddToPicList(reg_t listReference, int argc, reg_t *argv) {
 	List *list;
+	byte tempPicNotValid = 0;
 
 	_ports->setPort((Port *)_ports->_picWind);
 
@@ -689,6 +687,7 @@
 		error("kAddToPic called with non-list as parameter");
 
 	makeSortedList(list);
+	fill(tempPicNotValid);
 	addToPicDrawCels();
 
 	addToPicSetPicNotValid();


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




More information about the Scummvm-git-logs mailing list