syncing changes from ssc svn, mostly.

[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
+1 -5
View File
@@ -97,9 +97,7 @@ static LocalizedString COLLECTING_SAMPLE( "ScreenSyncOverlay", "Collecting sampl
static LocalizedString STANDARD_DEVIATION( "ScreenSyncOverlay", "Standard deviation" );
void ScreenSyncOverlay::UpdateText()
{
//
// Update Status
//
vector<RString> vs;
if( g_bShowAutoplay )
@@ -126,14 +124,12 @@ void ScreenSyncOverlay::UpdateText()
{
AdjustSync::GetSyncChangeTextGlobal( vs );
AdjustSync::GetSyncChangeTextSong( vs );
}
}
m_textStatus.SetText( join("\n",vs) );
//
// Update SyncInfo
//
bool bVisible = GAMESTATE->m_SongOptions.GetCurrent().m_AutosyncType != SongOptions::AUTOSYNC_OFF;
m_textAdjustments.SetVisible( bVisible );
if( bVisible )