[Scummvm-cvs-logs] SF.net SVN: scummvm: [21334] scummvm/trunk/engines/kyra/animator.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Mar 16 09:38:03 CET 2006
Revision: 21334
Author: lordhoto
Date: 2006-03-16 09:37:34 -0800 (Thu, 16 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21334&view=rev
Log Message:
-----------
Oops. removes some unneeded shifts and fixes now the feather bug.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/animator.cpp
Modified: scummvm/trunk/engines/kyra/animator.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator.cpp 2006-03-16 17:27:52 UTC (rev 21333)
+++ scummvm/trunk/engines/kyra/animator.cpp 2006-03-16 17:37:34 UTC (rev 21334)
@@ -178,10 +178,10 @@
int x = 0, y = 0, width = obj->width << 3, height = obj->height;
if (restore) {
- x = obj->x2 >> 3;
+ x = obj->x2;
y = obj->y2;
} else {
- x = obj->x1 >> 3;
+ x = obj->x1;
y = obj->y1;
}
@@ -202,9 +202,9 @@
}
if (restore) {
- _screen->copyBlockToPage(_screen->_curPage, x << 3, y, width, height, obj->background);
+ _screen->copyBlockToPage(_screen->_curPage, x, y, width, height, obj->background);
} else {
- _screen->copyRegionToBuffer(_screen->_curPage, x << 3, y, width, height, obj->background);
+ _screen->copyRegionToBuffer(_screen->_curPage, x, y, width, height, obj->background);
}
}
@@ -373,14 +373,11 @@
if (curObject->active) {
if (curObject->refreshFlag || refreshFlag) {
int xpos = 0, ypos = 0, width = 0, height = 0;
- xpos = (curObject->x1>>3) - (curObject->width2>>3) - 1;
+ xpos = curObject->x1 - curObject->width2 - 8;
ypos = curObject->y1 - curObject->height2;
- width = curObject->width + (curObject->width2>>3) + 2;
+ width = (curObject->width<<3) + curObject->width2 + 16;
height = curObject->height + curObject->height2*2;
- xpos <<= 3;
- width <<= 3;
-
if (xpos < 8) {
xpos = 8;
} else if (xpos + width > 312) {
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