KYRA: hopefully fix broken NDS, AmigaOS, PSP, OpenPandora ports

Unfortunately I don't understand the reason for the PSP and OpenPandora failure. The (should be irrelevant) DarkmoonSequenceHelper changes are just a try...
scummvm · Apr 13, 2019 · 087444b · 087444b
1 parent 651387b
commit 087444b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
@@ -3358,7 +3358,7 @@ void Screen::loadPalette(const byte *data, Palette &pal, int bytes) {
 	if (_isAmiga) {
 		// EOB II Amiga sometimes has multiple palettes here one after
 		// the other (64 bytes each). We only load the first one here.
-		pal.loadAmigaPalette(stream, 0, MIN(32, stream.size() / Palette::kAmigaBytesPerColor));
+		pal.loadAmigaPalette(stream, 0, MIN<int>(32, stream.size() / Palette::kAmigaBytesPerColor));
 	} else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) {
 		pal.loadPC98Palette(stream, 0, stream.size() / Palette::kPC98BytesPerColor);
 	} else if (_renderMode == Common::kRenderEGA) {

diff --git a/engines/kyra/sequence/sequences_darkmoon.cpp b/engines/kyra/sequence/sequences_darkmoon.cpp
@@ -1120,9 +1120,7 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da
 		delete[] items[i].str;
 }
 
-DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, Mode mode) :
-	_system(system), _vm(vm), _screen(screen) {
-
+DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, Mode mode) : _system(system), _vm(vm), _screen(screen) {
 	assert(mode == kIntro || mode == kFinale);
 
 	static const uint16 soundMarkersFMTowns[2][8] = {