[Scummvm-cvs-logs] SF.net SVN: scummvm: [25423] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Feb 8 09:39:33 CET 2007
Revision: 25423
http://scummvm.svn.sourceforge.net/scummvm/?rev=25423&view=rev
Author: lordhoto
Date: 2007-02-08 00:39:33 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
- fixed crash in FM-Towns version when entering the grotto
- fixed some palette issues
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script_v1.cpp
scummvm/trunk/engines/kyra/sound.cpp
Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp 2007-02-07 23:23:10 UTC (rev 25422)
+++ scummvm/trunk/engines/kyra/script_v1.cpp 2007-02-08 08:39:33 UTC (rev 25423)
@@ -622,9 +622,7 @@
int KyraEngine::o1_setCustomPaletteRange(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "o1_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
- uint8 *screenPal = _screen->_currentPalette;
- memcpy(&screenPal[stackPos(1)*3], _specialPalettes[stackPos(0)], stackPos(2)*3);
- _screen->setScreenPalette(screenPal);
+ memcpy(_screen->getPalette(1) + stackPos(1)*3, _specialPalettes[stackPos(0)], stackPos(2)*3);
return 0;
}
@@ -1265,8 +1263,7 @@
}
}
const uint8 *palette = _specialPalettes[palIndex];
- memcpy(&_screen->_currentPalette[684], palette, 44);
- _screen->setScreenPalette(_screen->_currentPalette);
+ memcpy(_screen->getPalette(1) + 684, palette, 44);
return 0;
}
Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp 2007-02-07 23:23:10 UTC (rev 25422)
+++ scummvm/trunk/engines/kyra/sound.cpp 2007-02-08 08:39:33 UTC (rev 25423)
@@ -55,7 +55,7 @@
_compressHandle.close();
_engine->resource()->getFileHandle(filenamebuffer, &fileSize, _compressHandle);
- if (!_compressHandle.isOpen())
+ if (!_compressHandle.isOpen())
continue;
_currentVocFile = _supportedCodes[i].streamFunc(&_compressHandle, fileSize);
@@ -454,7 +454,7 @@
if (track == 49) {
snd_playWanderScoreViaMap(56, 1);
return;
- } else if (track == 10) {
+ } else if (track == 0 || track == 1 || track == 10) {
// I don't know what's supposed to happen here, but calling playSoundEffect will lead to crash
return;
}
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