[Scummvm-cvs-logs] SF.net SVN: scummvm:[44092] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Tue Sep 15 00:24:30 CEST 2009
Revision: 44092
http://scummvm.svn.sourceforge.net/scummvm/?rev=44092&view=rev
Author: athrxx
Date: 2009-09-14 22:24:30 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
LOL: fix some regressions
Modified Paths:
--------------
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/lol.h
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-09-14 22:23:35 UTC (rev 44091)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-09-14 22:24:30 UTC (rev 44092)
@@ -1722,7 +1722,7 @@
if (_flags.isTalkie || _loadSuppFilesFlag)
return;
- Palette tpal(768);
+ Palette tpal(256);
_screen->loadPalette("fxpal.col", tpal);
_screen->loadBitmap("fxpal.shp", 3, 3, 0);
const uint8 *shpPal = _screen->getPtrToShape(_screen->getCPagePtr(2), 0) + 11;
@@ -2209,7 +2209,7 @@
gui_drawScene(0);
_screen->copyPage(0, 12);
- Palette tpal(768), swampCol(768);
+ Palette tpal(256), swampCol(256);
if (_currentLevel == 11 && !(_flagsTable[52] & 0x04)) {
uint8 *sc = _screen->getPalette(0).getData();
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2009-09-14 22:23:35 UTC (rev 44091)
+++ scummvm/trunk/engines/kyra/lol.h 2009-09-14 22:24:30 UTC (rev 44092)
@@ -744,7 +744,7 @@
int olol_characterSkillTest(EMCState *script);
int olol_countAllMonsters(EMCState *script);
int olol_playEndSequence(EMCState *script);
- int olol_stopCharacterSpeech(EMCState *script);
+ int olol_updatePortraits(EMCState *script);
int olol_setPaletteBrightness(EMCState *script);
int olol_calcInflictableDamage(EMCState *script);
int olol_getInflictedDamage(EMCState *script);
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-09-14 22:23:35 UTC (rev 44091)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-09-14 22:24:30 UTC (rev 44092)
@@ -1287,8 +1287,10 @@
int LoLEngine::olol_playCharacterScriptChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_playCharacterScriptChat(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
- snd_stopSpeech(1);
- updatePortraits();
+ if (_flags.isTalkie) {
+ snd_stopSpeech(1);
+ updatePortraits();
+ }
return playCharacterScriptChat(stackPos(0), stackPos(1), 1, getLangString(stackPos(2)), script, 0, 3);
}
@@ -1427,9 +1429,10 @@
return 0;
}
-int LoLEngine::olol_stopCharacterSpeech(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_stopCharacterSpeech(%p)", (const void *)script);
- snd_stopSpeech(1);
+int LoLEngine::olol_updatePortraits(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_updatePortraits(%p)", (const void *)script);
+ if (_flags.isTalkie)
+ snd_stopSpeech(1);
updatePortraits();
return 1;
}
@@ -2184,7 +2187,7 @@
_res->loadFileToBuf("LITEPAL3.COL", tpal1, 768);
_screen->generateFadeTable(tpal2, tpal4, tpal1, 4);
- Palette pal(768);
+ Palette pal(256);
for (int i = 0; i < 21; i++) {
uint32 etime = _system->getMillis() + 20 * _tickLength;
@@ -2804,7 +2807,7 @@
// 0x68
Opcode(olol_countAllMonsters);
Opcode(olol_playEndSequence);
- Opcode(olol_stopCharacterSpeech);
+ Opcode(olol_updatePortraits);
Opcode(olol_setPaletteBrightness);
// 0x6C
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2009-09-14 22:23:35 UTC (rev 44091)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2009-09-14 22:24:30 UTC (rev 44092)
@@ -2941,7 +2941,6 @@
}
TownsPC98_OpnCore::~TownsPC98_OpnCore() {
- _mixer->stopHandle(_soundHandle);
delete _ssg;
delete _prc;
delete[] _chanInternal;
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