Attempt to fix MenuTimer-related warning dialogs that come up when changing themes (happens when one theme's warning timer starts higher than another, and the other theme doesn't define it).

This commit is contained in:
AJ Kelly
2010-03-26 01:38:07 -05:00
parent f5eb67f7fe
commit 4bbc834a8c
2 changed files with 8 additions and 5 deletions
+4
View File
@@ -48,6 +48,10 @@ void MenuTimer::Load( RString sMetricsGroup )
WARNING_START.Load(sMetricsGroup,"WarningStart");
WARNING_BEEP_START.Load(sMetricsGroup,"WarningBeepStart");
MAX_STALL_SECONDS.Load(sMetricsGroup,"MaxStallSeconds");
if(WARNING_COMMAND)
WARNING_COMMAND->Clear();
WARNING_COMMAND = new ThemeMetric1D<apActorCommands>(sMetricsGroup, WARNING_COMMAND_NAME, WARNING_START+1);
m_fStallSecondsLeft = MAX_STALL_SECONDS;
+4 -5
View File
@@ -22,14 +22,13 @@ public:
void Start(); // resume countdown from paused
void Pause(); // don't count down
void Stop(); // set to "00" and pause
void Disable(); // set to "99" and pause
void Disable(); // set to "99" and pause
void Stall(); // pause countdown for a sec
void EnableSilent( bool bSilent ) { m_bSilent = bSilent; } // make timer silent
void EnableStealth( bool bStealth ); // make timer invisible and silent
void EnableSilent( bool bSilent ) { m_bSilent = bSilent; } // make timer silent
void EnableStealth( bool bStealth ); // make timer invisible and silent
//
// Lua
//
virtual void PushSelf( lua_State *L );
protected: