actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify HelpDisplay

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-16 05:52:24 +00:00
parent d0872d4459
commit c022522fa8
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/HelpDisplay.cpp
+5 -15
View File
@@ -11,24 +11,13 @@ HelpDisplay::HelpDisplay()
{ {
m_iCurTipIndex = 0; m_iCurTipIndex = 0;
m_fSecsUntilSwitch = 0; m_fSecsUntilSwitch = 0;
m_fSecsBetweenSwitches = 1;
} }
void HelpDisplay::Load( const RString &sType ) void HelpDisplay::Load( const RString &sType )
{ {
TIP_SHOW_TIME.Load( sType, "TipShowTime" );
RunCommands( THEME->GetMetricA(sType,"TipOnCommand") ); RunCommands( THEME->GetMetricA(sType,"TipOnCommand") );
m_fSecsUntilSwitch = THEME->GetMetricF(sType,"TipShowTime");
LoadFromFont( THEME->GetPathF(sType,"text") );
m_fSecsUntilSwitch = TIP_SHOW_TIME;
}
void HelpDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
{
BitmapText::LoadFromNode( sDir, pNode );
Load( m_sName );
} }
void HelpDisplay::SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt ) void HelpDisplay::SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt )
@@ -63,7 +52,7 @@ void HelpDisplay::Update( float fDeltaTime )
return; return;
// time to switch states // time to switch states
m_fSecsUntilSwitch = TIP_SHOW_TIME; m_fSecsUntilSwitch = m_fSecsBetweenSwitches;
SetText( m_arrayTips[m_iCurTipIndex], m_arrayTipsAlt[m_iCurTipIndex] ); SetText( m_arrayTips[m_iCurTipIndex], m_arrayTipsAlt[m_iCurTipIndex] );
m_iCurTipIndex++; m_iCurTipIndex++;
m_iCurTipIndex = m_iCurTipIndex % m_arrayTips.size(); m_iCurTipIndex = m_iCurTipIndex % m_arrayTips.size();
@@ -114,11 +103,12 @@ public:
return 2; return 2;
} }
static int setsecsbetweenswitches( T* p, lua_State *L ) { p->SetSecsBetweenSwitches( FArg(1) ); return 0; }
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( settips ); ADD_METHOD( settips );
ADD_METHOD( gettips ); ADD_METHOD( gettips );
ADD_METHOD( setsecsbetweenswitches );
Luna<T>::Register( L ); Luna<T>::Register( L );
} }
stepmania/src/HelpDisplay.h
+2 -4
View File
@@ -4,7 +4,6 @@
#define HELP_DISPLAY_H #define HELP_DISPLAY_H
#include "BitmapText.h" #include "BitmapText.h"
#include "ThemeMetric.h"
#include "MessageManager.h" #include "MessageManager.h"
struct lua_State; struct lua_State;
@@ -15,12 +14,12 @@ public:
HelpDisplay(); HelpDisplay();
void Load( const RString &sType ); void Load( const RString &sType );
void LoadFromNode( const RString& sDir, const XNode* pNode );
virtual Actor *Copy() const; virtual Actor *Copy() const;
void SetTips( const vector<RString> &arrayTips ) { SetTips( arrayTips, arrayTips ); } void SetTips( const vector<RString> &arrayTips ) { SetTips( arrayTips, arrayTips ); }
void SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt ); void SetTips( const vector<RString> &arrayTips, const vector<RString> &arrayTipsAlt );
void GetTips( vector<RString> &arrayTipsOut, vector<RString> &arrayTipsAltOut ) const { arrayTipsOut = m_arrayTips; arrayTipsAltOut = m_arrayTipsAlt; } void GetTips( vector<RString> &arrayTipsOut, vector<RString> &arrayTipsAltOut ) const { arrayTipsOut = m_arrayTips; arrayTipsAltOut = m_arrayTipsAlt; }
void SetSecsBetweenSwitches( float fSeconds ) { m_fSecsBetweenSwitches = m_fSecsUntilSwitch = fSeconds; }
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
@@ -28,11 +27,10 @@ public:
virtual void PushSelf( lua_State *L ); virtual void PushSelf( lua_State *L );
protected: protected:
ThemeMetric<float> TIP_SHOW_TIME;
vector<RString> m_arrayTips, m_arrayTipsAlt; vector<RString> m_arrayTips, m_arrayTipsAlt;
int m_iCurTipIndex; int m_iCurTipIndex;
float m_fSecsBetweenSwitches;
float m_fSecsUntilSwitch; float m_fSecsUntilSwitch;
}; };
stepmania/src/ScreenWithMenuElements.cpp
+1
View File
@@ -98,6 +98,7 @@ void ScreenWithMenuElements::Init()
m_textHelp->SetName( "Help" ); m_textHelp->SetName( "Help" );
m_textHelp->Load( "HelpDisplay" ); m_textHelp->Load( "HelpDisplay" );
m_textHelp->LoadFromFont( THEME->GetPathF("HelpDisplay","text") );
SET_XY( m_textHelp ); SET_XY( m_textHelp );
LoadHelpText(); LoadHelpText();
this->AddChild( m_textHelp ); this->AddChild( m_textHelp );