[Scummvm-cvs-logs] SF.net SVN: scummvm:[47108] scummvm/trunk/engines/sci/graphics/view.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Thu Jan 7 14:56:56 CET 2010
Revision: 47108
http://scummvm.svn.sourceforge.net/scummvm/?rev=47108&view=rev
Author: m_kiewitz
Date: 2010-01-07 13:56:56 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
SCI: small cleanup in view drawing
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/view.cpp
Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp 2010-01-07 13:30:08 UTC (rev 47107)
+++ scummvm/trunk/engines/sci/graphics/view.cpp 2010-01-07 13:56:56 UTC (rev 47108)
@@ -482,26 +482,25 @@
bitmap += (clipRect.top - rect.top) * celWidth + (clipRect.left - rect.left);
// TODO: SCI1.1 view scaling
-
if (!_EGAmapping) {
- for (y = clipRectTranslated.top; y < clipRectTranslated.top + height; y++, bitmap += celWidth) {
+ for (y = 0; y < height; y++, bitmap += celWidth) {
for (x = 0; x < width; x++) {
color = bitmap[x];
- if (color != clearKey && priority >= _screen->getPriority(clipRectTranslated.left + x, y)) {
+ if (color != clearKey && priority >= _screen->getPriority(clipRectTranslated.left + x, clipRectTranslated.top + y)) {
if (origHeight == -1) // HACK: this parameter is passed for already scaled views, but we're not actually using it
- _screen->putPixel(clipRectTranslated.left + x, y, drawMask, palette->mapping[color], priority, 0);
+ _screen->putPixel(clipRectTranslated.left + x, clipRectTranslated.top + y, drawMask, palette->mapping[color], priority, 0);
else
- _screen->putPixelOnDisplay(clipRectTranslated.left + x, y, palette->mapping[color]);
+ _screen->putPixelOnDisplay(clipRectTranslated.left + x, clipRectTranslated.top + y, palette->mapping[color]);
}
}
}
} else {
byte *EGAmapping = _EGAmapping + (EGAmappingNr * SCI_VIEW_EGAMAPPING_SIZE);
- for (y = clipRectTranslated.top; y < clipRectTranslated.top + height; y++, bitmap += celWidth) {
+ for (y = 0; y < height; y++, bitmap += celWidth) {
for (x = 0; x < width; x++) {
color = EGAmapping[bitmap[x]];
- if (color != clearKey && priority >= _screen->getPriority(clipRectTranslated.left + x, y))
- _screen->putPixel(clipRectTranslated.left + x, y, drawMask, color, priority, 0);
+ if (color != clearKey && priority >= _screen->getPriority(clipRectTranslated.left + x, clipRectTranslated.top + y))
+ _screen->putPixel(clipRectTranslated.left + x, clipRectTranslated.top + y, drawMask, color, priority, 0);
}
}
}
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