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

fix misleading name: NumSongs -> NumStages

Browse Source
This commit is contained in:
Chris Danford
2004-08-30 06:07:14 +00:00
parent b5fd173a67
commit 3fec094b26
5 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Other/Profile Stats.xsl
+6 -6
View File
@@ -247,11 +247,11 @@
</xsl:call-template> </xsl:call-template>
<xsl:call-template name="CollapsibleSubSection"> <xsl:call-template name="CollapsibleSubSection">
<xsl:with-param name="title">Passed Count by Grade</xsl:with-param> <xsl:with-param name="title">Stages Passed by Grade</xsl:with-param>
<xsl:with-param name="text"> <xsl:with-param name="text">
<xsl:call-template name="PrintVerticalDataTable"> <xsl:call-template name="PrintVerticalDataTable">
<xsl:with-param name="text"> <xsl:with-param name="text">
<xsl:variable name="NumSongsPassedByGrade" select="NumSongsPassedByGrade" /> <xsl:variable name="NumStagesPassedByGrade" select="NumStagesPassedByGrade" />
<xsl:for-each select="$Catalog/Types/Grade"> <xsl:for-each select="$Catalog/Types/Grade">
<xsl:call-template name="PrintVerticalDataRow"> <xsl:call-template name="PrintVerticalDataRow">
<xsl:with-param name="name"> <xsl:with-param name="name">
@@ -259,7 +259,7 @@
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="value"> <xsl:with-param name="value">
<xsl:variable name="blah" select="." /> <xsl:variable name="blah" select="." />
<xsl:value-of select="sum($NumSongsPassedByGrade/*[name()=$blah])" /> <xsl:value-of select="sum($NumStagesPassedByGrade/*[name()=$blah])" />
</xsl:with-param> </xsl:with-param>
</xsl:call-template> </xsl:call-template>
</xsl:for-each> </xsl:for-each>
@@ -269,11 +269,11 @@
</xsl:call-template> </xsl:call-template>
<xsl:call-template name="CollapsibleSubSection"> <xsl:call-template name="CollapsibleSubSection">
<xsl:with-param name="title">Passed Count by PlayMode</xsl:with-param> <xsl:with-param name="title">Stages Passed by PlayMode</xsl:with-param>
<xsl:with-param name="text"> <xsl:with-param name="text">
<xsl:call-template name="PrintVerticalDataTable"> <xsl:call-template name="PrintVerticalDataTable">
<xsl:with-param name="text"> <xsl:with-param name="text">
<xsl:variable name="NumSongsPassedByPlayMode" select="NumSongsPassedByPlayMode" /> <xsl:variable name="NumStagesPassedByPlayMode" select="NumStagesPassedByPlayMode" />
<xsl:for-each select="$Catalog/Types/PlayMode"> <xsl:for-each select="$Catalog/Types/PlayMode">
<xsl:call-template name="PrintVerticalDataRow"> <xsl:call-template name="PrintVerticalDataRow">
<xsl:with-param name="name"> <xsl:with-param name="name">
@@ -281,7 +281,7 @@
</xsl:with-param> </xsl:with-param>
<xsl:with-param name="value"> <xsl:with-param name="value">
<xsl:variable name="blah" select="." /> <xsl:variable name="blah" select="." />
<xsl:value-of select="sum($NumSongsPassedByPlayMode/*[name()=$blah])" /> <xsl:value-of select="sum($NumStagesPassedByPlayMode/*[name()=$blah])" />
</xsl:with-param> </xsl:with-param>
</xsl:call-template> </xsl:call-template>
</xsl:for-each> </xsl:for-each>
stepmania/src/GameState.cpp
+5 -7
View File
@@ -307,11 +307,11 @@ void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNum
// If you fail in a course, you passed all but the final song. // If you fail in a course, you passed all but the final song.
// FIXME: Not true. If playing with 2 players, one player could have failed earlier. // FIXME: Not true. If playing with 2 players, one player could have failed earlier.
int iNumSongsPassed = ss.vpSongs.size(); if( !ss.bFailed[pn] )
if( ss.bFailed[pn] ) {
iNumSongsPassed -= 1; pProfile->m_iNumStagesPassedByPlayMode[ss.playMode] ++;
pProfile->m_iNumSongsPassedByPlayMode[ss.playMode] += iNumSongsPassed; pProfile->m_iNumStagesPassedByGrade[ss.GetGrade(pn)] ++;
pProfile->m_iNumSongsPassedByGrade[ss.GetGrade(pn)] += iNumSongsPassed; }
} }
void GameState::EndGame() void GameState::EndGame()
@@ -524,14 +524,12 @@ void GameState::ResetStageStatistics()
} }
{
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
m_vLastPerDifficultyAwards[p].clear(); m_vLastPerDifficultyAwards[p].clear();
m_vLastPeakComboAwards[p].clear(); m_vLastPeakComboAwards[p].clear();
} }
} }
}
void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer &timestamp ) void GameState::UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer &timestamp )
{ {
stepmania/src/Profile.cpp
+17 -17
View File
@@ -105,8 +105,8 @@ void Profile::InitGeneralData()
m_iNumSongsPlayedByDifficulty[i] = 0; m_iNumSongsPlayedByDifficulty[i] = 0;
for( i=0; i<MAX_METER+1; i++ ) for( i=0; i<MAX_METER+1; i++ )
m_iNumSongsPlayedByMeter[i] = 0; m_iNumSongsPlayedByMeter[i] = 0;
ZERO( m_iNumSongsPassedByPlayMode ); ZERO( m_iNumStagesPassedByPlayMode );
ZERO( m_iNumSongsPassedByGrade ); ZERO( m_iNumStagesPassedByGrade );
} }
void Profile::InitSongScores() void Profile::InitSongScores()
@@ -182,7 +182,7 @@ CString Profile::GetDisplayTotalCaloriesBurnedToday() const
int Profile::GetTotalNumSongsPlayed() const int Profile::GetTotalNumSongsPlayed() const
{ {
int iTotal = 0; int iTotal = 0;
for( int i=0; i<NUM_PLAY_MODES; i++ ) FOREACH_PlayMode( i )
iTotal += m_iNumSongsPlayedByPlayMode[i]; iTotal += m_iNumSongsPlayedByPlayMode[i];
return iTotal; return iTotal;
} }
@@ -190,8 +190,8 @@ int Profile::GetTotalNumSongsPlayed() const
int Profile::GetTotalNumSongsPassed() const int Profile::GetTotalNumSongsPassed() const
{ {
int iTotal = 0; int iTotal = 0;
for( int i=0; i<NUM_PLAY_MODES; i++ ) FOREACH_PlayMode( i )
iTotal += m_iNumSongsPassedByPlayMode[i]; iTotal += m_iNumStagesPassedByPlayMode[i];
return iTotal; return iTotal;
} }
@@ -803,23 +803,23 @@ XNode* Profile::SaveGeneralDataCreateNode() const
} }
{ {
XNode* pNumSongsPassedByGrade = pGeneralDataNode->AppendChild("NumSongsPassedByGrade"); XNode* pNumStagesPassedByGrade = pGeneralDataNode->AppendChild("NumStagesPassedByGrade");
FOREACH_Grade( g ) FOREACH_Grade( g )
{ {
if( !m_iNumSongsPassedByGrade[g] ) if( !m_iNumStagesPassedByGrade[g] )
continue; continue;
pNumSongsPassedByGrade->AppendChild( GradeToString(g), m_iNumSongsPassedByGrade[g] ); pNumStagesPassedByGrade->AppendChild( GradeToString(g), m_iNumStagesPassedByGrade[g] );
} }
} }
{ {
XNode* pNumSongsPassedByPlayMode = pGeneralDataNode->AppendChild("NumSongsPassedByPlayMode"); XNode* pNumStagesPassedByPlayMode = pGeneralDataNode->AppendChild("NumStagesPassedByPlayMode");
FOREACH_PlayMode( pm ) FOREACH_PlayMode( pm )
{ {
/* Don't save unplayed PlayModes. */ /* Don't save unplayed PlayModes. */
if( !m_iNumSongsPassedByPlayMode[pm] ) if( !m_iNumStagesPassedByPlayMode[pm] )
continue; continue;
pNumSongsPassedByPlayMode->AppendChild( PlayModeToString(pm), m_iNumSongsPassedByPlayMode[pm] ); pNumStagesPassedByPlayMode->AppendChild( PlayModeToString(pm), m_iNumStagesPassedByPlayMode[pm] );
} }
} }
@@ -945,17 +945,17 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
} }
{ {
const XNode* pNumSongsPassedByGrade = pNode->GetChild("NumSongsPassedByGrade"); const XNode* pNumStagesPassedByGrade = pNode->GetChild("NumStagesPassedByGrade");
if( pNumSongsPassedByGrade ) if( pNumStagesPassedByGrade )
FOREACH_Grade( g ) FOREACH_Grade( g )
pNumSongsPassedByGrade->GetChildValue( GradeToString(g), m_iNumSongsPassedByGrade[g] ); pNumStagesPassedByGrade->GetChildValue( GradeToString(g), m_iNumStagesPassedByGrade[g] );
} }
{ {
const XNode* pNumSongsPassedByPlayMode = pNode->GetChild("NumSongsPassedByPlayMode"); const XNode* pNumStagesPassedByPlayMode = pNode->GetChild("NumStagesPassedByPlayMode");
if( pNumSongsPassedByPlayMode ) if( pNumStagesPassedByPlayMode )
FOREACH_PlayMode( pm ) FOREACH_PlayMode( pm )
pNumSongsPassedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumSongsPassedByPlayMode[pm] ); pNumStagesPassedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumStagesPassedByPlayMode[pm] );
} }
stepmania/src/Profile.h
+2 -2
View File
@@ -116,8 +116,8 @@ public:
map<StyleID,int> m_iNumSongsPlayedByStyle; map<StyleID,int> m_iNumSongsPlayedByStyle;
int m_iNumSongsPlayedByDifficulty[NUM_DIFFICULTIES]; int m_iNumSongsPlayedByDifficulty[NUM_DIFFICULTIES];
int m_iNumSongsPlayedByMeter[MAX_METER+1]; int m_iNumSongsPlayedByMeter[MAX_METER+1];
int m_iNumSongsPassedByPlayMode[NUM_PLAY_MODES]; int m_iNumStagesPassedByPlayMode[NUM_PLAY_MODES];
int m_iNumSongsPassedByGrade[NUM_GRADES]; int m_iNumStagesPassedByGrade[NUM_GRADES];
// //
// Song high scores // Song high scores
stepmania/src/UnlockSystem.cpp
+9 -9
View File
@@ -130,8 +130,8 @@ static float GetArcadePoints( const Profile *pProfile )
switch(g) switch(g)
{ {
case GRADE_TIER_1: case GRADE_TIER_1:
case GRADE_TIER_2: fAP += 9 * pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_2: fAP += 9 * pProfile->m_iNumStagesPassedByGrade[g]; break;
default: fAP += 1 * pProfile->m_iNumSongsPassedByGrade[g]; break; default: fAP += 1 * pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_FAILED: case GRADE_FAILED:
case GRADE_NO_DATA: case GRADE_NO_DATA:
@@ -164,13 +164,13 @@ static float GetSongPoints( const Profile *pProfile )
{ {
switch( g ) switch( g )
{ {
case GRADE_TIER_1:/*AAAA*/ fSP += 20 * pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_1:/*AAAA*/ fSP += 20 * pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_2:/*AAA*/ fSP += 10* pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_2:/*AAA*/ fSP += 10* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_3:/*AA*/ fSP += 5* pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_3:/*AA*/ fSP += 5* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_4:/*A*/ fSP += 4* pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_4:/*A*/ fSP += 4* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_5:/*B*/ fSP += 3* pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_5:/*B*/ fSP += 3* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_6:/*C*/ fSP += 2* pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_6:/*C*/ fSP += 2* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_TIER_7:/*D*/ fSP += 1* pProfile->m_iNumSongsPassedByGrade[g]; break; case GRADE_TIER_7:/*D*/ fSP += 1* pProfile->m_iNumStagesPassedByGrade[g]; break;
case GRADE_FAILED: case GRADE_FAILED:
case GRADE_NO_DATA: case GRADE_NO_DATA:
; // no points ; // no points