[Scummvm-cvs-logs] SF.net SVN: scummvm:[44197] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sat Sep 19 19:39:32 CEST 2009
Revision: 44197
http://scummvm.svn.sourceforge.net/scummvm/?rev=44197&view=rev
Author: athrxx
Date: 2009-09-19 17:39:31 +0000 (Sat, 19 Sep 2009)
Log Message:
-----------
LOL/PC-98: fix some asserts
Modified Paths:
--------------
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/script_lol.cpp
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2009-09-19 13:29:21 UTC (rev 44196)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2009-09-19 17:39:31 UTC (rev 44197)
@@ -835,6 +835,9 @@
}
bool Screen_LoL::fadeColor(int dstColorIndex, int srcColorIndex, uint32 elapsedTime, uint32 targetTime) {
+ if (_use16ColorMode)
+ return false;
+
const uint8 *dst = _screenPalette->getData() + 3 * dstColorIndex;
const uint8 *src = _screenPalette->getData() + 3 * srcColorIndex;
uint8 *p = getPalette(1).getData() + 3 * dstColorIndex;
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-09-19 13:29:21 UTC (rev 44196)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-09-19 17:39:31 UTC (rev 44197)
@@ -869,9 +869,13 @@
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));
- _screen->fadePalette(_screen->getPalette(3), 10);
+ if (_flags.use16ColorMode) {
+ setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
+ } else {
+ _screen->getPalette(3).copy(_screen->getPalette(0), 128);
+ _screen->loadSpecialColors(_screen->getPalette(3));
+ _screen->fadePalette(_screen->getPalette(3), 10);
+ }
_screen->_fadeFlag = 0;
return 1;
}
@@ -2430,9 +2434,13 @@
break;
case 1:
- _screen->getPalette(3).copy(_screen->getPalette(0), 128);
- _screen->loadSpecialColors(_screen->getPalette(3));
- _screen->fadePalette(_screen->getPalette(3), 10);
+ if (_flags.use16ColorMode) {
+ _screen->fadePalette(_screen->getPalette(1), 10);
+ } else {
+ _screen->getPalette(3).copy(_screen->getPalette(0), 128);
+ _screen->loadSpecialColors(_screen->getPalette(3));
+ _screen->fadePalette(_screen->getPalette(3), 10);
+ }
_screen->_fadeFlag = 0;
break;
@@ -2442,7 +2450,7 @@
case 3:
_screen->loadSpecialColors(_screen->getPalette(3));
- _screen->fadePalette(_screen->getPalette(3), 10);
+ _screen->fadePalette(_screen->getPalette(_flags.use16ColorMode ? 1 : 3), 10);
_screen->_fadeFlag = 0;
break;
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