[Scummvm-git-logs] scummvm master -> 554ed06034a2a568580994b6b41532a5d452f0e8

[sev-]

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

Summary:
cd4e446a28 KINGDOM: Fix compilation
554ed06034 KINGDOM: Fix warnings


Commit: cd4e446a284d970d4f1099aaf4c5a714cb605eb6
    https://github.com/scummvm/scummvm/commit/cd4e446a284d970d4f1099aaf4c5a714cb605eb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-07T11:32:03+02:00

Commit Message:
KINGDOM: Fix compilation

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index 7ed7ae2e21..1e12b6e911 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -504,7 +504,7 @@ void KingdomGame::playMovie(int movieNum) {
 
 		bool skipMovie = false;
 		while (!decoder->endOfVideo() && !skipMovie && !shouldQuit()) {
-			unsigned int delay = MIN(decoder->getTimeToNextFrame(), 10u);
+			unsigned int delay = MIN<uint32>(decoder->getTimeToNextFrame(), 10u);
 			g_system->delayMillis(delay);
 
 			const Graphics::Surface *frame = nullptr;


Commit: 554ed06034a2a568580994b6b41532a5d452f0e8
    https://github.com/scummvm/scummvm/commit/554ed06034a2a568580994b6b41532a5d452f0e8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-07T11:34:47+02:00

Commit Message:
KINGDOM: Fix warnings

Changed paths:
    engines/kingdom/logic2.cpp
    engines/kingdom/logic3.cpp


diff --git a/engines/kingdom/logic2.cpp b/engines/kingdom/logic2.cpp
index 9751994131..e0e53a797c 100644
--- a/engines/kingdom/logic2.cpp
+++ b/engines/kingdom/logic2.cpp
@@ -335,7 +335,7 @@ void Logic::GPL2_301() {
 		if (_vm->_userInput)
 			warning("Skipped UserInput %d(0x%04X) for _StatPlay %d", _vm->_userInput, _vm->_userInput, _statPlay);
 		break;
-	} 
+	}
 }
 
 void Logic::GPL2_302() {
@@ -375,7 +375,7 @@ void Logic::GPL2_311() {
 		_vm->playMovie(68);
 		_statPlay = 992;
 		_vm->_loopFlag = true;
-		break;			
+		break;
 	default:
 		if (_vm->_userInput)
 			warning("Skipped UserInput %d(0x%04X) for _StatPlay %d", _vm->_userInput, _vm->_userInput, _statPlay);
@@ -570,7 +570,7 @@ void Logic::GPL2_351() {
 		_vm->playMovie(178);
 		_vm->_userInput = 0x2F1;
 		_vm->_loopFlag = true;
-		// No break on purpose
+		// fallthrough
 	case 0x2F1:
 		_vm->_aTimer = 0;
 		dsAll();
diff --git a/engines/kingdom/logic3.cpp b/engines/kingdom/logic3.cpp
index 09101b9e5a..cb26873c94 100644
--- a/engines/kingdom/logic3.cpp
+++ b/engines/kingdom/logic3.cpp
@@ -633,7 +633,7 @@ void Logic::GPL3_581() {
 		_vm->_tsIconOnly = true;
 		_currMap = 10;
 		_vm->playSound(30);
-		// No break on purpose
+		// fallthrough
 	case 0x428:
 	case 0x429:
 	case 0x42A: