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

don't run InitCommand until fonts are loaded

Browse Source
This commit is contained in:
Chris Danford
2006-04-21 00:42:56 +00:00
parent 603a13e520
commit 63989c4aee
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PercentageDisplay.cpp
+6 -4
View File
@@ -8,7 +8,6 @@
#include "RageLog.h" #include "RageLog.h"
#include "StageStats.h" #include "StageStats.h"
#include "PlayerState.h" #include "PlayerState.h"
#include "LuaFunctions.h"
#include "XmlFile.h" #include "XmlFile.h"
ThemeMetric<int> PERCENT_DECIMAL_PLACES ( "PercentageDisplay", "PercentDecimalPlaces" ); ThemeMetric<int> PERCENT_DECIMAL_PLACES ( "PercentageDisplay", "PercentDecimalPlaces" );
@@ -27,8 +26,6 @@ PercentageDisplay::PercentageDisplay()
void PercentageDisplay::LoadFromNode( const RString& sDir, const XNode* pNode ) void PercentageDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
{ {
ActorFrame::LoadFromNode( sDir, pNode );
pNode->GetAttrValue( "DancePointsDigits", m_iDancePointsDigits ); pNode->GetAttrValue( "DancePointsDigits", m_iDancePointsDigits );
pNode->GetAttrValue( "PercentUseRemainder", m_bUseRemainder ); pNode->GetAttrValue( "PercentUseRemainder", m_bUseRemainder );
pNode->GetAttrValue( "ApplyScoreDisplayOptions", m_bApplyScoreDisplayOptions ); pNode->GetAttrValue( "ApplyScoreDisplayOptions", m_bApplyScoreDisplayOptions );
@@ -36,7 +33,7 @@ void PercentageDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
const XNode *pChild = pNode->GetChild( "Percent" ); const XNode *pChild = pNode->GetChild( "Percent" );
if( pChild == NULL ) if( pChild == NULL )
RageException::Throw( ssprintf("ComboGraph in \"%s\" is missing the node \"Percent\"", sDir.c_str()) ); RageException::Throw( ssprintf("PercentageDisplay in \"%s\" is missing the node \"Percent\"", sDir.c_str()) );
m_textPercent.LoadFromNode( sDir, pChild ); m_textPercent.LoadFromNode( sDir, pChild );
this->AddChild( &m_textPercent ); this->AddChild( &m_textPercent );
@@ -48,6 +45,9 @@ void PercentageDisplay::LoadFromNode( const RString& sDir, const XNode* pNode )
m_textPercentRemainder.LoadFromNode( sDir, pChild ); m_textPercentRemainder.LoadFromNode( sDir, pChild );
this->AddChild( &m_textPercentRemainder ); this->AddChild( &m_textPercentRemainder );
} }
// only run the Init command after we load Fonts.
ActorFrame::LoadFromNode( sDir, pNode );
} }
void PercentageDisplay::Load( const PlayerState *pPlayerState, const PlayerStageStats *pPlayerStageStats ) void PercentageDisplay::Load( const PlayerState *pPlayerState, const PlayerStageStats *pPlayerStageStats )
@@ -180,6 +180,8 @@ RString PercentageDisplay::FormatPercentScore( float fPercentDancePoints )
} }
// lua start // lua start
#include "LuaFunctions.h"
LuaFunction( FormatPercentScore, PercentageDisplay::FormatPercentScore( FArg(1) ) ) LuaFunction( FormatPercentScore, PercentageDisplay::FormatPercentScore( FArg(1) ) )
#include "LuaBinding.h" #include "LuaBinding.h"