[Scummvm-git-logs] scummvm master -> 98d333d2c6e0c9374497b33f7bbf3cf960c1decc

[mgerhardy]

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

Summary:
ac943779d2 TWINE: fixed behaviour menu offsets
d46733ce2b TWINE: fixed ScopedKeyMap disabling of keymap
98d333d2c6 TWINE: fixed restarting music track


Commit: ac943779d2b619899b2134c5466cb14419c0500d
    https://github.com/scummvm/scummvm/commit/ac943779d2b619899b2134c5466cb14419c0500d
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-11-26T09:43:08+01:00

Commit Message:
TWINE: fixed behaviour menu offsets

introduced in a967242757f099bb5deec786e4759121754c24b7

Changed paths:
    engines/twine/menu.cpp


diff --git a/engines/twine/menu.cpp b/engines/twine/menu.cpp
index a4ea267090..8be7553af5 100644
--- a/engines/twine/menu.cpp
+++ b/engines/twine/menu.cpp
@@ -938,7 +938,7 @@ void Menu::drawBehaviourMenu(int32 angle) {
 	prepareAndDrawBehaviour(angle, HeroBehaviourType::kAggressive);
 	prepareAndDrawBehaviour(angle, HeroBehaviourType::kDiscrete);
 
-	drawInfoMenu(titleRect.left, titleRect.top);
+	drawInfoMenu(titleRect.left, titleRect.bottom + 10);
 
 	_engine->copyBlockPhys(titleRect);
 }


Commit: d46733ce2b15c62d4c811c065137d0f5d74df538
    https://github.com/scummvm/scummvm/commit/d46733ce2b15c62d4c811c065137d0f5d74df538
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-11-26T09:43:08+01:00

Commit Message:
TWINE: fixed ScopedKeyMap disabling of keymap

Addresses bug https://bugs.scummvm.org/ticket/11975

Changed paths:
    engines/twine/input.cpp


diff --git a/engines/twine/input.cpp b/engines/twine/input.cpp
index d06c0473ce..e22aa396d3 100644
--- a/engines/twine/input.cpp
+++ b/engines/twine/input.cpp
@@ -36,6 +36,7 @@ const char *cutsceneKeyMapId = "cutsceneKeyMap";
 
 ScopedKeyMap::ScopedKeyMap(TwinEEngine* engine, const char *id) : _engine(engine) {
 	_changed = _engine->_input->enableAdditionalKeyMap(id, true);
+	_keymap = id;
 }
 
 ScopedKeyMap::~ScopedKeyMap() {


Commit: 98d333d2c6e0c9374497b33f7bbf3cf960c1decc
    https://github.com/scummvm/scummvm/commit/98d333d2c6e0c9374497b33f7bbf3cf960c1decc
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-11-26T09:43:08+01:00

Commit Message:
TWINE: fixed restarting music track

Addresses bug https://bugs.scummvm.org/ticket/11978

Changed paths:
    engines/twine/menu.cpp
    engines/twine/music.cpp


diff --git a/engines/twine/menu.cpp b/engines/twine/menu.cpp
index 8be7553af5..f28681ccae 100644
--- a/engines/twine/menu.cpp
+++ b/engines/twine/menu.cpp
@@ -645,7 +645,7 @@ int32 Menu::optionsMenu() {
 	_engine->flip();
 
 	_engine->_sound->stopSamples();
-	//_engine->_music->playCDtrack(9);
+	//_engine->_music->playTrackMusic(9);
 
 	ScopedCursor scoped(_engine);
 	for (;;) {
diff --git a/engines/twine/music.cpp b/engines/twine/music.cpp
index 63d3798f1b..7f98f6f34c 100644
--- a/engines/twine/music.cpp
+++ b/engines/twine/music.cpp
@@ -142,14 +142,15 @@ bool Music::playTrackMusic(int32 track) {
 	if (track == currentMusic) {
 		return true;
 	}
-	currentMusic = track;
 
 	stopMusic();
 	if (playTrackMusicCd(track)) {
+		currentMusic = track;
 		debug("Play cd music track %i", track);
 		return true;
 	}
 	if (playMidiMusic(track)) {
+		currentMusic = track;
 		debug("Play midi music track %i", track);
 		return true;
 	}