[Scummvm-git-logs] scummvm master -> 087444b6981606369bc93b19993d6acd6dbf6354

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
087444b698 KYRA: hopefully fix broken NDS, AmigaOS, PSP, OpenPandora ports


Commit: 087444b6981606369bc93b19993d6acd6dbf6354
    https://github.com/scummvm/scummvm/commit/087444b6981606369bc93b19993d6acd6dbf6354
Author: athrxx (athrxx at scummvm.org)
Date: 2019-04-13T22:24:42+02:00

Commit Message:
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...

Changed paths:
    engines/kyra/graphics/screen.cpp
    engines/kyra/sequence/sequences_darkmoon.cpp


diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index b69cc07..b20fa46 100644
--- 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
index 7a581e5..b68bbfd 100644
--- 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] = {