[Scummvm-cvs-logs] SF.net SVN: scummvm:[41947] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Jun 29 18:08:16 CEST 2009
Revision: 41947
http://scummvm.svn.sourceforge.net/scummvm/?rev=41947&view=rev
Author: lordhoto
Date: 2009-06-29 16:08:16 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Change Screen_LoL::loadSpecialColors to take an Palette object as parameter.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/scene_lol.cpp
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/screen_lol.h
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/script_tim.cpp
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-06-29 16:08:00 UTC (rev 41946)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-06-29 16:08:16 UTC (rev 41947)
@@ -1680,7 +1680,7 @@
void LoLEngine::generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier) {
dst.copy(src);
- _screen->loadSpecialColors(dst.getData());
+ _screen->loadSpecialColors(dst);
brightness = (8 - brightness) << 5;
if (modifier >= 0 && modifier < 8 && (_flagsTable[31] & 0x08)) {
@@ -3663,8 +3663,8 @@
SWAP(s[i], d[i]);
generateBrightnessPalette(_screen->getPalette(0), _screen->getPalette(1), _brightness, _lampEffect);
- _screen->loadSpecialColors(s);
- _screen->loadSpecialColors(d2);
+ _screen->loadSpecialColors(_screen->getPalette(2));
+ _screen->loadSpecialColors(_screen->getPalette(1));
playSpellAnimation(0, 0, 0, 2, 0, 0, 0, s, d2, 40, 0);
}
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-06-29 16:08:00 UTC (rev 41946)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-06-29 16:08:16 UTC (rev 41947)
@@ -1434,7 +1434,7 @@
if (fadeFlag) {
_screen->getPalette(3).copy(_screen->getPalette(0), 128);
- _screen->loadSpecialColors(_screen->getPalette(3).getData());
+ _screen->loadSpecialColors(_screen->getPalette(3));
_screen->fadePalette(_screen->getPalette(3), 10);
_screen->_fadeFlag = 0;
}
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2009-06-29 16:08:00 UTC (rev 41946)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2009-06-29 16:08:16 UTC (rev 41947)
@@ -285,7 +285,7 @@
Palette tpal(getPalette(0).getNumColors());
tpal.copy(getPalette(0), 128);
- loadSpecialColors(tpal.getData());
+ loadSpecialColors(tpal);
fadePalette(tpal, delay);
fillRect(112, 0, 288, 120, 0);
@@ -837,13 +837,13 @@
}
void Screen_LoL::fadeToPalette1(int delay) {
- loadSpecialColors(getPalette(1).getData());
+ loadSpecialColors(getPalette(1));
fadePalette(getPalette(1), delay);
_fadeFlag = 0;
}
-void Screen_LoL::loadSpecialColors(uint8 *destPalette) {
- memcpy(destPalette + 0x240, _screenPalette->getData() + 0x240, 12);
+void Screen_LoL::loadSpecialColors(Palette &dst) {
+ dst.copy(*_screenPalette, 192, 4);
}
void Screen_LoL::copyColor(int dstColorIndex, int srcColorIndex) {
Modified: scummvm/trunk/engines/kyra/screen_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.h 2009-06-29 16:08:00 UTC (rev 41946)
+++ scummvm/trunk/engines/kyra/screen_lol.h 2009-06-29 16:08:16 UTC (rev 41947)
@@ -70,7 +70,7 @@
// palette stuff
void fadeToBlack(int delay=0x54, const UpdateFunctor *upFunc = 0);
void fadeToPalette1(int delay);
- void loadSpecialColors(uint8 *destPalette);
+ void loadSpecialColors(Palette &dst);
void copyColor(int dstColorIndex, int srcColorIndex);
bool fadeColor(int dstColorIndex, int srcColorIndex, uint32 elapsedTime, uint32 targetTime);
bool fadePaletteStep(uint8 *pal1, uint8 *pal2, uint32 elapsedTime, uint32 targetTime);
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-06-29 16:08:00 UTC (rev 41946)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-06-29 16:08:16 UTC (rev 41947)
@@ -865,7 +865,7 @@
int LoLEngine::olol_fadeSequencePalette(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_fadeSequencePalette(%p)", (const void *)script);
_screen->getPalette(3).copy(_screen->getPalette(0), 128);
- _screen->loadSpecialColors(_screen->getPalette(3).getData());
+ _screen->loadSpecialColors(_screen->getPalette(3));
_screen->fadePalette(_screen->getPalette(3), 10);
_screen->_fadeFlag = 0;
return 1;
@@ -2106,8 +2106,8 @@
uint8 ovl[256];
generateFlashPalette(p1.getData(), p2.getData(), stackPos(0));
- _screen->loadSpecialColors(p1.getData());
- _screen->loadSpecialColors(p2.getData());
+ _screen->loadSpecialColors(p1);
+ _screen->loadSpecialColors(p2);
if (_smoothScrollModeNormal) {
for (int i = 0; i < 256; i++)
@@ -2401,7 +2401,7 @@
case 1:
_screen->getPalette(3).copy(_screen->getPalette(0), 128);
- _screen->loadSpecialColors(_screen->getPalette(3).getData());
+ _screen->loadSpecialColors(_screen->getPalette(3));
_screen->fadePalette(_screen->getPalette(3), 10);
_screen->_fadeFlag = 0;
break;
@@ -2411,7 +2411,7 @@
break;
case 3:
- _screen->loadSpecialColors(_screen->getPalette(3).getData());
+ _screen->loadSpecialColors(_screen->getPalette(3));
_screen->fadePalette(_screen->getPalette(3), 10);
_screen->_fadeFlag = 0;
break;
@@ -2425,7 +2425,7 @@
break;
case 5:
- _screen->loadSpecialColors(_screen->getPalette(3).getData());
+ _screen->loadSpecialColors(_screen->getPalette(3));
_screen->fadePalette(_screen->getPalette(1), 10);
_screen->_fadeFlag = 0;
break;
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2009-06-29 16:08:00 UTC (rev 41946)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2009-06-29 16:08:16 UTC (rev 41947)
@@ -970,7 +970,7 @@
anim->wsa->displayFrame(0, 0, x, y, 0, 0, 0);
if (wsaFlags & 3) {
- _screen->loadSpecialColors(_screen->getPalette(3).getData());
+ _screen->loadSpecialColors(_screen->getPalette(3));
_screen->fadePalette(_screen->getPalette(3), 10);
_screen->_fadeFlag = 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