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

fix asserts in ScreenNameEntryTraditional w/ ScreenTestMode on

Browse Source
This commit is contained in:
Chris Danford
2005-04-25 06:06:47 +00:00
parent 07e55a4e65
commit 90474dbd7b
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenNameEntryTraditional.cpp
+17 -14
View File
@@ -137,31 +137,34 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S
for( int z = 0; z < 3; ++z ) for( int z = 0; z < 3; ++z )
{ {
ss.vpPlayedSongs.push_back( SONGMAN->GetRandomSong() ); ss.vpPlayedSongs.push_back( SONGMAN->GetRandomSong() );
ss.m_player[PLAYER_1].iPossibleDancePoints = 100; ss.vpPossibleSongs = ss.vpPlayedSongs;
ss.m_player[PLAYER_1].iActualDancePoints = 100; ss.pStyle = GAMESTATE->m_pCurStyle;
ss.m_player[PLAYER_1].iScore = 100; ss.playMode = GAMESTATE->m_PlayMode;
ss.m_player[PLAYER_2].iPossibleDancePoints = 100;
ss.m_player[PLAYER_2].iActualDancePoints = 100;
ss.m_player[PLAYER_2].iScore = 100;
ASSERT( ss.vpPlayedSongs[0]->GetAllSteps().size() ); ASSERT( ss.vpPlayedSongs[0]->GetAllSteps().size() );
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
ss.m_player[p].vpPlayedSteps.push_back( ss.vpPlayedSongs[0]->GetAllSteps()[0] ); Steps *pSteps = ss.vpPlayedSongs[0]->GetAllSteps()[0];
GAMESTATE->m_pCurSteps[p].Set( ss.m_player[p].vpPlayedSteps[0] ); ss.m_player[p].vpPlayedSteps.push_back( pSteps );
GAMESTATE->m_pCurSteps[p].Set( pSteps );
ss.m_player[p].iPossibleDancePoints = 100;
ss.m_player[p].iActualDancePoints = 100;
ss.m_player[p].iScore = 100;
ss.m_player[p].iPossibleDancePoints = 1000; ss.m_player[p].iPossibleDancePoints = 1000;
ss.m_player[p].iActualDancePoints = 985; ss.m_player[p].iActualDancePoints = 985;
ss.m_player[p].vpPossibleSteps.push_back( pSteps );
HighScore hs; HighScore hs;
hs.grade = GRADE_TIER03; hs.grade = GRADE_TIER03;
hs.fPercentDP = ss.m_player[p].GetPercentDancePoints(); hs.fPercentDP = ss.m_player[p].GetPercentDancePoints();
hs.iScore = ss.m_player[p].iScore; hs.iScore = ss.m_player[p].iScore;
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
int a, b; int a, b;
PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], GAMESTATE->m_pCurSteps[p], p, hs, a, b ); PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], pSteps, p, hs, a, b );
PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], GAMESTATE->m_pCurSteps[p], p, hs, a, b ); PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], pSteps, p, hs, a, b );
PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], GAMESTATE->m_pCurSteps[p], p, hs, a, b ); PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], pSteps, p, hs, a, b );
PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], GAMESTATE->m_pCurSteps[p], p, hs, a, b ); PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], pSteps, p, hs, a, b );
PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], GAMESTATE->m_pCurSteps[p], p, hs, a, b ); PROFILEMAN->AddStepsScore( ss.vpPlayedSongs[0], pSteps, p, hs, a, b );
PROFILEMAN->AddCategoryScore( st, RANKING_A, p, hs, a, b ); PROFILEMAN->AddCategoryScore( st, RANKING_A, p, hs, a, b );
} }
stepmania/src/StatsManager.cpp
+6
View File
@@ -17,6 +17,12 @@ StageStats AccumStageStats( const vector<StageStats>& vss )
{ {
StageStats ssreturn; StageStats ssreturn;
if( !vss.empty() )
{
ssreturn.pStyle = vss[0].pStyle;
ssreturn.playMode = vss[0].playMode;
}
FOREACH_CONST( StageStats, vss, ss ) FOREACH_CONST( StageStats, vss, ss )
ssreturn.AddStats( *ss ); ssreturn.AddStats( *ss );