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

syncing changes from ssc svn, mostly.

Browse Source 
[Course.cpp] HasTimedMods() now actually checks for timed mods (technically non-global) instead of being a clone of HasMods()
[Player.cpp] add MAX_HOLD_LIFE/[Player] MaxHoldLife metric
[ScreenGameplay] looking into places to put loading of replay data, perhaps?
[elsewhere] lots of cleanup, and I'm sure there's lots more to be done.
add a todo to ProductivityHelpers.
This commit is contained in:
AJ Kelly
2010-02-02 16:00:10 -06:00
parent 81b4011423
commit ca8f660c4f
12 changed files with 93 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/StepsDisplay.cpp
+15 -5
View File
@@ -59,7 +59,6 @@ void StepsDisplay::Load( const RString &sMetricsGroup, const PlayerState *pPlaye
m_bShowStepsType.Load(m_sMetricsGroup,"ShowStepsType");
m_sZeroMeterString.Load(m_sMetricsGroup,"ZeroMeterString");
m_sprFrame.Load( THEME->GetPathG(m_sMetricsGroup,"frame") );
m_sprFrame->SetName( "Frame" );
ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_sprFrame, m_sMetricsGroup );
@@ -67,7 +66,7 @@ void StepsDisplay::Load( const RString &sMetricsGroup, const PlayerState *pPlaye
if( m_bShowTicks )
{
RString sChars = "10"; // on, off
RString sChars = "10"; // on, off (todo: make this metricable -aj)
m_textTicks.SetName( "Ticks" );
m_textTicks.LoadFromTextureAndChars( THEME->GetPathF(m_sMetricsGroup,"ticks"), sChars );
ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_textTicks, m_sMetricsGroup );
@@ -84,7 +83,7 @@ void StepsDisplay::Load( const RString &sMetricsGroup, const PlayerState *pPlaye
// These commands should have been loaded by SetXYAndOnCommand above.
ASSERT( m_textMeter.HasCommand("Set") );
}
if( m_bShowDescription )
{
m_textDescription.SetName( "Description" );
@@ -92,7 +91,7 @@ void StepsDisplay::Load( const RString &sMetricsGroup, const PlayerState *pPlaye
ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_textDescription, m_sMetricsGroup );
this->AddChild( &m_textDescription );
}
if( m_bShowAutogen )
{
m_sprAutogen.Load( THEME->GetPathG(m_sMetricsGroup,"Autogen") );
@@ -242,13 +241,24 @@ void StepsDisplay::SetInternal( const SetParams &params )
{
m_textDescription.SetText( sDisplayDescription );
}
if( m_bShowAutogen )
{
bool b = params.pSteps && params.pSteps->IsAutogen();
m_sprAutogen->SetVisible( b );
}
if( m_bShowStepsType )
{
if( params.st != StepsType_Invalid )
{
/*
RString sStepsType = GAMEMAN->GetStepsTypeInfo(params.st).szName;
m_sprStepsType.Load( THEME->GetPathG(m_sMetricsGroup,"StepsType "+sStepsType) );
*/
}
}
this->HandleMessage( msg );
}