[Scummvm-git-logs] scummvm master -> 0aeff580a69485aff3b2e8d60dbd7c9241376c9d

[madmoose]

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

Summary:
fcccb2b8c3 KINGDOM: Use _frameStop in MoviePlay
a01c28e475 KINGDOM: Fix logic error in getUserInput
2553cc0603 KINGDOM: Properly initialize inventory slots
0aeff580a6 KINGDOM: Fix logic error in checkMainScreen


Commit: fcccb2b8c31cba45aabe286c9f05f925028fd189
    https://github.com/scummvm/scummvm/commit/fcccb2b8c31cba45aabe286c9f05f925028fd189
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2020-06-07T00:13:55+02:00

Commit Message:
KINGDOM: Use _frameStop in MoviePlay

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index 5fd9c345fd..e748022f65 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -497,6 +497,11 @@ void KingdomGame::playMovie(int movieNum) {
 	if (decoder->loadFile(path)) {
 		decoder->setAudioTrack(_sound);
 		decoder->start();
+
+		if (_frameStop) {
+			decoder->setEndFrame(_frameStop);
+		}
+
 		bool skipMovie = false;
 		while (!decoder->endOfVideo() && !skipMovie && !shouldQuit()) {
 			unsigned int delay = MIN(decoder->getTimeToNextFrame(), 10u);


Commit: a01c28e47506bcd23f08cbe6558f0ad7fc19ac5d
    https://github.com/scummvm/scummvm/commit/a01c28e47506bcd23f08cbe6558f0ad7fc19ac5d
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2020-06-07T00:14:12+02:00

Commit Message:
KINGDOM: Fix logic error in getUserInput

You can now pick up the spell of traveling.

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index e748022f65..bdceaccf23 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -993,7 +993,7 @@ void KingdomGame::getUserInput() {
 		_loopFlag = true;
 	}
 
-	if (_userInput == 0x42B && _logic->_statPlay == 53 && _gameMode == 0) {
+	if (_userInput == 0x42B && _logic->_statPlay != 53 && _gameMode == 0) {
 		_logic->_oldStatPlay = _logic->_statPlay;
 		_logic->_statPlay = 900;
 		_loopFlag = true;


Commit: 2553cc0603040b3452e48cbd81824cf9c018644a
    https://github.com/scummvm/scummvm/commit/2553cc0603040b3452e48cbd81824cf9c018644a
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2020-06-07T00:14:38+02:00

Commit Message:
KINGDOM: Properly initialize inventory slots

Changed paths:
    engines/kingdom/logic.cpp


diff --git a/engines/kingdom/logic.cpp b/engines/kingdom/logic.cpp
index e212f522fd..636d4e686d 100644
--- a/engines/kingdom/logic.cpp
+++ b/engines/kingdom/logic.cpp
@@ -59,7 +59,8 @@ void Logic::initVariables() {
 }
 
 void Logic::initPlay() {
-	memset(_inventory, 0xFF, 19);
+	for (int i = 0; i != 19; ++i)
+		_inventory[i] = -1;
 
 	for (int i = 0; i < 99; i++)
 		_nodes[i] = 0;
@@ -565,7 +566,9 @@ void Logic::characterDeath() {
 	_currMap = 3;
 	dsAll();
 	_pouch = false;
-	memset(_inventory, -1, 19);
+	for (int i = 0; i != 19; ++i) {
+		_inventory[i] = -1;
+	}
 	_statPlay = 994;
 	_vm->_loopFlag = true;
 }


Commit: 0aeff580a69485aff3b2e8d60dbd7c9241376c9d
    https://github.com/scummvm/scummvm/commit/0aeff580a69485aff3b2e8d60dbd7c9241376c9d
Author: Thomas Fach-Pedersen (thomas at fach-pedersen.net)
Date: 2020-06-07T00:14:47+02:00

Commit Message:
KINGDOM: Fix logic error in checkMainScreen

Usable inventory items are now shown on the log.

Changed paths:
    engines/kingdom/kingdom.cpp


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index bdceaccf23..6a3921d06b 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -1181,7 +1181,7 @@ void KingdomGame::refreshSound() {
 }
 
 void KingdomGame::checkMainScreen() {
-	if (_cTimerFlag || _logic->_statPlay == 900 || _logic->_statPlay == 901)
+	if (!_cTimerFlag || _logic->_statPlay == 900 || _logic->_statPlay == 901)
 		return;
 
 	_cTimerFlag = false;