aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/kyra/graphics/screen.cpp2
-rw-r--r--engines/kyra/sequence/sequences_darkmoon.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index b69cc07e77..b20fa46c48 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 7a581e55ba..b68bbfd939 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] = {