silent, stealth
This commit is contained in:
@@ -23,6 +23,7 @@ MenuTimer::MenuTimer() :
|
|||||||
m_fStallSeconds = 0;
|
m_fStallSeconds = 0;
|
||||||
m_fStallSecondsLeft = MAX_STALL_SECONDS;
|
m_fStallSecondsLeft = MAX_STALL_SECONDS;
|
||||||
m_bPaused = false;
|
m_bPaused = false;
|
||||||
|
m_bSilent = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MenuTimer::Load()
|
void MenuTimer::Load()
|
||||||
@@ -45,10 +46,7 @@ void MenuTimer::Load()
|
|||||||
|
|
||||||
void MenuTimer::EnableStealth( bool bStealth )
|
void MenuTimer::EnableStealth( bool bStealth )
|
||||||
{
|
{
|
||||||
if( bStealth )
|
EnableSilent( bStealth );
|
||||||
m_soundBeep.Unload(); // unload the sound
|
|
||||||
else
|
|
||||||
m_soundBeep.Load( THEME->GetPathS("MenuTimer","tick") ); // reload the sound
|
|
||||||
|
|
||||||
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
|
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
|
||||||
{
|
{
|
||||||
@@ -92,7 +90,7 @@ void MenuTimer::Update( float fDeltaTime )
|
|||||||
m_text[i].RunCommands( WARNING_COMMAND.GetValue(iCrossed) );
|
m_text[i].RunCommands( WARNING_COMMAND.GetValue(iCrossed) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( iCrossed <= WARNING_BEEP_START && m_soundBeep.IsLoaded() )
|
if( iCrossed <= WARNING_BEEP_START && m_soundBeep.IsLoaded() && !m_bSilent )
|
||||||
m_soundBeep.Play();
|
m_soundBeep.Play();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,12 +186,16 @@ public:
|
|||||||
static int setseconds( T* p, lua_State *L ) { p->SetSeconds(FArg(1)); return 0; }
|
static int setseconds( T* p, lua_State *L ) { p->SetSeconds(FArg(1)); return 0; }
|
||||||
static int pause( T* p, lua_State *L ) { p->Pause(); return 0; }
|
static int pause( T* p, lua_State *L ) { p->Pause(); return 0; }
|
||||||
static int stop( T* p, lua_State *L ) { p->Stop(); return 0; }
|
static int stop( T* p, lua_State *L ) { p->Stop(); return 0; }
|
||||||
|
static int silent( T* p, lua_State *L ) { p->EnableSilent(BArg(1)); return 0; }
|
||||||
|
static int stealth( T* p, lua_State *L ) { p->EnableStealth(BArg(1)); return 0; }
|
||||||
|
|
||||||
LunaMenuTimer()
|
LunaMenuTimer()
|
||||||
{
|
{
|
||||||
ADD_METHOD( setseconds );
|
ADD_METHOD( setseconds );
|
||||||
ADD_METHOD( pause );
|
ADD_METHOD( pause );
|
||||||
ADD_METHOD( stop );
|
ADD_METHOD( stop );
|
||||||
|
ADD_METHOD( silent );
|
||||||
|
ADD_METHOD( stealth );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public:
|
|||||||
void Stop(); // set to "00" and pause
|
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 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 EnableStealth( bool bStealth ); // make timer invisible and silent
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -38,6 +39,8 @@ protected:
|
|||||||
|
|
||||||
#define NUM_MENU_TIMER_TEXTS 2
|
#define NUM_MENU_TIMER_TEXTS 2
|
||||||
|
|
||||||
|
bool m_bSilent;
|
||||||
|
|
||||||
BitmapText m_text[NUM_MENU_TIMER_TEXTS];
|
BitmapText m_text[NUM_MENU_TIMER_TEXTS];
|
||||||
|
|
||||||
LuaReference m_exprFormatText[NUM_MENU_TIMER_TEXTS];
|
LuaReference m_exprFormatText[NUM_MENU_TIMER_TEXTS];
|
||||||
|
|||||||
Reference in New Issue
Block a user