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

[mgerhardy]

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:
28d1b0c8b2 TWINE: comment about midi indices
a75d77e564 TWINE: logging


Commit: 28d1b0c8b23da5e0ce96899b0c7269b88882f8a4
    https://github.com/scummvm/scummvm/commit/28d1b0c8b23da5e0ce96899b0c7269b88882f8a4
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-09T15:35:32+01:00

Commit Message:
TWINE: comment about midi indices

Changed paths:
    engines/twine/audio/music.h


diff --git a/engines/twine/audio/music.h b/engines/twine/audio/music.h
index e2733686f0..a4a636e1b2 100644
--- a/engines/twine/audio/music.h
+++ b/engines/twine/audio/music.h
@@ -76,6 +76,7 @@ public:
 	/**
 	 * Play MIDI music
 	 * @param midiIdx music index under mini_mi_win.hqr
+	 * @note valid indices for lba1 are [1-33]
 	 */
 	bool playMidiMusic(int32 midiIdx, int32 loop = 0);
 	/** Stop MIDI music */


Commit: a75d77e56494976bb15b0579681195079b3466e7
    https://github.com/scummvm/scummvm/commit/a75d77e56494976bb15b0579681195079b3466e7
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-09T15:35:32+01:00

Commit Message:
TWINE: logging

Changed paths:
    engines/twine/scene/gamestate.cpp


diff --git a/engines/twine/scene/gamestate.cpp b/engines/twine/scene/gamestate.cpp
index c401dcc7d3..771e777d09 100644
--- a/engines/twine/scene/gamestate.cpp
+++ b/engines/twine/scene/gamestate.cpp
@@ -65,6 +65,7 @@ void GameState::initEngineProjections() {
 }
 
 void GameState::initGameStateVars() {
+	debug(2, "Init game state variables");
 	_engine->_extra->resetExtras();
 
 	for (int32 i = 0; i < OVERLAY_MAX_ENTRIES; i++) {
@@ -104,6 +105,7 @@ void GameState::initHeroVars() {
 }
 
 void GameState::initEngineVars() {
+	debug(2, "Init engine variables");
 	_engine->_interface->resetClip();
 
 	_engine->_scene->alphaLight = 896;
@@ -149,7 +151,9 @@ bool GameState::loadGame(Common::SeekableReadStream *file) {
 		return false;
 	}
 
+	debug(2, "Load game");
 	if (file->readByte() != 0x03) {
+		warning("Could not load savegame - wrong magic byte");
 		return false;
 	}
 
@@ -218,6 +222,7 @@ bool GameState::loadGame(Common::SeekableReadStream *file) {
 }
 
 bool GameState::saveGame(Common::WriteStream *file) {
+	debug(2, "Save game");
 	if (playerName[0] == '\0') {
 		Common::strlcpy(playerName, "TwinEngineSave", sizeof(playerName));
 	}