Added music
This commit is contained in:
1 parent
7db9ca8f70
commit
84f9fa37a8
13 files changed
+118
-8
No files matched your search
+39
-2
@@ -92,9 +92,10 @@ namespace ZL {
|
||||
}
|
||||
}
|
||||
|
||||
MenuManager::MenuManager(Renderer& iRenderer, GameState& gameState) :
|
||||
MenuManager::MenuManager(Renderer& iRenderer, GameState& gameState, AudioPlayerAsync& audioPlayer) :
|
||||
renderer(iRenderer),
|
||||
gameState_(gameState)
|
||||
gameState_(gameState),
|
||||
audioPlayer_(audioPlayer)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -250,6 +251,9 @@ namespace ZL {
|
||||
|
||||
void MenuManager::showMainMenu() {
|
||||
if (onResetGame) onResetGame();
|
||||
|
||||
audioPlayer_.playMusicAsync("audio/main menu final.ogg");
|
||||
|
||||
uiState_ = GameUiState::MainMenu;
|
||||
uiManager.clearMenuStack();
|
||||
topUiManager.replaceRoot(nullptr);
|
||||
@@ -900,13 +904,46 @@ namespace ZL {
|
||||
uiManager.replaceRoot(gameState_.isDarklands ? hudUniExtDarkRoot : hudUniExtRoot);
|
||||
applyCurrentHealthBar();
|
||||
setupGameplayHudCallbacks();
|
||||
if (gameState_.isDarklands)
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek fight calm.ogg");
|
||||
}
|
||||
else if (gameState_.isNight)
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek fight calm.ogg");
|
||||
}
|
||||
else
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek univer day.ogg");
|
||||
}
|
||||
} else if (locationName == "uni_interior") {
|
||||
applyUniIntHud();
|
||||
if (gameState_.isDarklands)
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek fight calm.ogg");
|
||||
}
|
||||
else if (gameState_.isNight)
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek fight calm.ogg");
|
||||
}
|
||||
else
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek univer day.ogg");
|
||||
}
|
||||
} else {
|
||||
// Returning to dorm: reuse step5ab, suppress already-completed hints
|
||||
uiManager.replaceRoot(hudStep5abRoot);
|
||||
applyCurrentHealthBar();
|
||||
setupStep5Callbacks();
|
||||
|
||||
if (gameState_.isNight)
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/bishkek fight calm.ogg");
|
||||
}
|
||||
else
|
||||
{
|
||||
audioPlayer_.playMusicAsync("audio/obshaga.ogg");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user