[Scummvm-cvs-logs] SF.net SVN: scummvm: [31206] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Mar 20 13:29:35 CET 2008
Revision: 31206
http://scummvm.svn.sourceforge.net/scummvm/?rev=31206&view=rev
Author: lordhoto
Date: 2008-03-20 05:29:35 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
- made Screen_v2::applyOverlay support dirty rect handling
- fixed copyRegion flags in KyraEngine_v2::scrollInventoryWheel
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/screen_v2.cpp
Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp 2008-03-20 12:10:30 UTC (rev 31205)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp 2008-03-20 12:29:35 UTC (rev 31206)
@@ -740,7 +740,7 @@
uint8 overlay[0x100];
_screen->generateOverlay(_screen->getPalette(0), overlay, 0, 50);
_screen->hideMouse();
- _screen->copyRegion(0x46, 0x90, 0x46, 0x79, 0x71, 0x17, 0, 2);
+ _screen->copyRegion(0x46, 0x90, 0x46, 0x79, 0x71, 0x17, 0, 2, Screen::CR_NO_P_CHECK);
_screen->showMouse();
snd_playSoundEffect(0x25);
@@ -766,7 +766,7 @@
}
_screen->applyOverlay(0x46, 0x79, 0x71, 0x17, 2, overlay);
- _screen->copyRegion(0x46, y+0x79, 0x46, 0x90, 0x71, 0x2E, 2, 0);
+ _screen->copyRegion(0x46, y+0x79, 0x46, 0x90, 0x71, 0x2E, 2, 0, Screen::CR_NO_P_CHECK);
_screen->updateScreen();
delayUntil(endTime);
Modified: scummvm/trunk/engines/kyra/screen_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_v2.cpp 2008-03-20 12:10:30 UTC (rev 31205)
+++ scummvm/trunk/engines/kyra/screen_v2.cpp 2008-03-20 12:29:35 UTC (rev 31206)
@@ -152,6 +152,9 @@
}
void Screen_v2::applyOverlay(int x, int y, int w, int h, int pageNum, const uint8 *overlay) {
+ if (pageNum == 0 || pageNum == 1)
+ addDirtyRect(x, y, w, h);
+
uint8 *dst = getPagePtr(pageNum) + y * 320 + x;
while (h--) {
for (int wi = 0; wi < w; ++wi) {
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