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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2007-08-13 19:13:04 +00:00
parent 66c08321e0
commit 332ea68aef
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenUnlockStatus.cpp
+3 -3
View File
@@ -288,17 +288,17 @@ void ScreenUnlockStatus::Init()
RString PointDisplay = TYPE_TO_DISPLAY; RString PointDisplay = TYPE_TO_DISPLAY;
if (PointDisplay == "DP" || PointDisplay == "Dance") if (PointDisplay == "DP" || PointDisplay == "Dance")
{ {
RString sDP = ssprintf( "%d", (int)UNLOCKMAN->DancePointsUntilNextUnlock() ); RString sDP = ssprintf( "%d", (int)UNLOCKMAN->PointsUntilNextUnlock(UnlockRequirement_DancePoints) );
PointsUntilNextUnlock.SetText( sDP ); PointsUntilNextUnlock.SetText( sDP );
} }
else if (PointDisplay == "AP" || PointDisplay == "Arcade") else if (PointDisplay == "AP" || PointDisplay == "Arcade")
{ {
RString sAP = ssprintf( "%d", (int)UNLOCKMAN->ArcadePointsUntilNextUnlock() ); RString sAP = ssprintf( "%d", (int)UNLOCKMAN->PointsUntilNextUnlock(UnlockRequirement_ArcadePoints) );
PointsUntilNextUnlock.SetText( sAP ); PointsUntilNextUnlock.SetText( sAP );
} }
else if (PointDisplay == "SP" || PointDisplay == "Song") else if (PointDisplay == "SP" || PointDisplay == "Song")
{ {
RString sSP = ssprintf( "%d", (int)UNLOCKMAN->SongPointsUntilNextUnlock() ); RString sSP = ssprintf( "%d", (int)UNLOCKMAN->PointsUntilNextUnlock(UnlockRequirement_SongPoints) );
PointsUntilNextUnlock.SetText( sSP ); PointsUntilNextUnlock.SetText( sSP );
} }
stepmania/src/UnlockManager.h
-6
View File
@@ -100,13 +100,7 @@ public:
~UnlockManager(); ~UnlockManager();
void Reload(); void Reload();
// returns # of points till next unlock - used for ScreenUnlock
float PointsUntilNextUnlock( UnlockRequirement t ) const; float PointsUntilNextUnlock( UnlockRequirement t ) const;
float ArcadePointsUntilNextUnlock() const { return PointsUntilNextUnlock(UnlockRequirement_ArcadePoints); }
float DancePointsUntilNextUnlock() const { return PointsUntilNextUnlock(UnlockRequirement_DancePoints); }
float SongPointsUntilNextUnlock() const { return PointsUntilNextUnlock(UnlockRequirement_SongPoints); }
// Used on select screens:
bool SongIsLocked( const Song *song ) const; bool SongIsLocked( const Song *song ) const;
bool SongIsRouletteOnly( const Song *song ) const; bool SongIsRouletteOnly( const Song *song ) const;
bool StepsIsLocked( const Song *pSong, const Steps *pSteps ) const; bool StepsIsLocked( const Song *pSong, const Steps *pSteps ) const;