fix not loading correctly the Common Sounds in ScreenManager. now loads and reloads fine
This commit is contained in:
@@ -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())
|
||||
|
||||
@@ -45,6 +45,7 @@ public:
|
||||
|
||||
void ReloadCreditsText();
|
||||
void RefreshCreditsMessages();
|
||||
void ReloadCommonSounds();
|
||||
|
||||
void EmptyDeleteQueue();
|
||||
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user