From 792af31c7a0eb07774f2aea25f8559c1a1eaa8f3 Mon Sep 17 00:00:00 2001 From: Hugo Hromic M Date: Sat, 21 Aug 2004 17:20:30 +0000 Subject: [PATCH] fix not loading correctly the Common Sounds in ScreenManager. now loads and reloads fine --- stepmania/src/ScreenManager.cpp | 17 ++++++++++------- stepmania/src/ScreenManager.h | 1 + stepmania/src/ThemeManager.cpp | 3 +++ stepmania/src/libresample/src/config.h | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 8d4c18d5cc..0f3894142f 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -341,13 +341,6 @@ ScreenManager::ScreenManager() m_ScreenBuffered = NULL; m_MessageSendOnPop = SM_None; - - - m_soundStart.Load( THEME->GetPathS("Common","start") ); - m_soundCoin.Load( THEME->GetPathS("Common","coin") ); - m_soundInvalid.Load( THEME->GetPathS("Common","invalid") ); - m_soundScreenshot.Load( THEME->GetPathS("Common","screenshot") ); - m_soundBack.Load( THEME->GetPathS("Common","back") ); } @@ -364,6 +357,16 @@ ScreenManager::~ScreenManager() delete m_SystemLayer; } +void ScreenManager::ReloadCommonSounds() +{ + // reload common sounds + m_soundStart.Load( THEME->GetPathS("Common","start") ); + m_soundCoin.Load( THEME->GetPathS("Common","coin") ); + m_soundInvalid.Load( THEME->GetPathS("Common","invalid") ); + m_soundScreenshot.Load( THEME->GetPathS("Common","screenshot") ); + m_soundBack.Load( THEME->GetPathS("Common","back") ); +} + void ScreenManager::EmptyDeleteQueue() { if(!m_ScreensToDelete.size()) diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h index c2f1b8b9f2..c8dda285cf 100644 --- a/stepmania/src/ScreenManager.h +++ b/stepmania/src/ScreenManager.h @@ -45,6 +45,7 @@ public: void ReloadCreditsText(); void RefreshCreditsMessages(); + void ReloadCommonSounds(); void EmptyDeleteQueue(); diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index f1ded4790d..97c4781fbe 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -201,6 +201,9 @@ void ThemeManager::SwitchThemeAndLanguage( CString sThemeName, CString sLanguage // load current theme LoadThemeRecursive( g_vThemes, m_sCurThemeName ); + // reload common sounds + if ( SCREENMAN != NULL ) + SCREENMAN->ReloadCommonSounds(); CString sMetric; for( i = 0; GetCommandlineArgument( "metric", &sMetric, i ); ++i ) diff --git a/stepmania/src/libresample/src/config.h b/stepmania/src/libresample/src/config.h index f3b8a58514..af7cff6691 100644 --- a/stepmania/src/libresample/src/config.h +++ b/stepmania/src/libresample/src/config.h @@ -3,6 +3,6 @@ system supported by GNU autoconf. For all other systems, use this file as a template to create config.h */ -#ifndef _XBOX + #define HAVE_INTTYPES_H 1 -#endif +