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

[mgerhardy]

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:
b3751f52b3 TWINE: replaced magic number


Commit: b3751f52b3b49a295609da4a6345a0e8a7683a82
    https://github.com/scummvm/scummvm/commit/b3751f52b3b49a295609da4a6345a0e8a7683a82
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-07-19T21:30:27+02:00

Commit Message:
TWINE: replaced magic number

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


diff --git a/engines/twine/scene/gamestate.h b/engines/twine/scene/gamestate.h
index 80bd0e4acc..c0bab73614 100644
--- a/engines/twine/scene/gamestate.h
+++ b/engines/twine/scene/gamestate.h
@@ -86,6 +86,11 @@ public:
 		return hasGameFlag(30) != 0;
 	}
 
+	// Arrived on the hamalayi with the rebels
+	inline bool hasArrivedHamalayi() const {
+		return hasGameFlag(90) != 0;
+	}
+
 	inline bool hasItem(InventoryItems item) const {
 		return hasGameFlag(item) != 0;
 	}
diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index 2af8d2968c..b9306c5462 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -599,7 +599,7 @@ void Scene::initSceneVars() {
 }
 
 void Scene::playSceneMusic() {
-	if (currentSceneIdx == LBA1SceneId::Tippet_Island_Twinsun_Cafe && _engine->_gameState->hasGameFlag(90)) {
+	if (currentSceneIdx == LBA1SceneId::Tippet_Island_Twinsun_Cafe && _engine->_gameState->hasArrivedHamalayi()) {
 		_engine->_music->playMidiMusic(8);
 	} else {
 		_engine->_music->playMidiMusic(_sceneMusic);