[Scummvm-git-logs] scummvm master -> dfce02d6a77b0c47e5f963d407f25461f1d4b556

[sev-]

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:
dfce02d6a7 XEEN: Fix compilation on Amiga


Commit: dfce02d6a77b0c47e5f963d407f25461f1d4b556
    https://github.com/scummvm/scummvm/commit/dfce02d6a77b0c47e5f963d407f25461f1d4b556
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T22:29:19+02:00

Commit Message:
XEEN: Fix compilation on Amiga

Changed paths:
    engines/xeen/worldofxeen/darkside_cutscenes.cpp



diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index a5de655..bbbe138 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -31,7 +31,7 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	SoundManager &sound = *_vm->_sound;
-	
+
 	// TODO: Starting method, and sound
 	//sub_28F40
 	screen.loadPalette("dark.pal");
@@ -194,8 +194,8 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 		}
 
 		yCtr -= timeExpired;
-		yp = MIN(yp + timeExpired, (uint)200);
-		 
+		yp = MIN((uint)(yp + timeExpired), (uint)200);
+
 		if (events.wait(1, true))
 			return false;
 
@@ -241,7 +241,7 @@ bool DarkSideCutscenes::showDarkSideEnding() {
 	Voc voc("ido2.voc");
 	Music newBright("newbrigh.m");
 	SpriteResource box("box.vga");
-	
+
 	newBright.play();
 	screen.loadBackground("scene1.raw");
 	screen.loadPalette("endgame.pal");