show PerDifficultyAward in course modes
This commit is contained in:
Chris Danford
+169
-176
@@ -874,15 +874,13 @@ void ScreenEvaluation::CommitScores(
|
|||||||
PerDifficultyAward pdaToShowOut[NUM_PLAYERS],
|
PerDifficultyAward pdaToShowOut[NUM_PLAYERS],
|
||||||
PeakComboAward pcaToShowOut[NUM_PLAYERS] )
|
PeakComboAward pcaToShowOut[NUM_PLAYERS] )
|
||||||
{
|
{
|
||||||
|
FOREACH_PlayerNumber( pn )
|
||||||
{
|
{
|
||||||
FOREACH_PlayerNumber( pn )
|
iPersonalHighScoreIndexOut[pn] = -1;
|
||||||
{
|
iMachineHighScoreIndexOut[pn] = -1;
|
||||||
iPersonalHighScoreIndexOut[pn] = -1;
|
rcOut[pn] = RANKING_INVALID;
|
||||||
iMachineHighScoreIndexOut[pn] = -1;
|
pdaToShowOut[pn] = PER_DIFFICULTY_AWARD_INVALID;
|
||||||
rcOut[pn] = RANKING_INVALID;
|
pcaToShowOut[pn] = PEAK_COMBO_AWARD_INVALID;
|
||||||
pdaToShowOut[pn] = PER_DIFFICULTY_AWARD_INVALID;
|
|
||||||
pcaToShowOut[pn] = PEAK_COMBO_AWARD_INVALID;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch( GAMESTATE->m_PlayMode )
|
switch( GAMESTATE->m_PlayMode )
|
||||||
@@ -907,79 +905,77 @@ void ScreenEvaluation::CommitScores(
|
|||||||
|
|
||||||
LOG->Trace( "saving stats and high scores" );
|
LOG->Trace( "saving stats and high scores" );
|
||||||
|
|
||||||
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
FOREACH_HumanPlayer( p )
|
// don't save scores if the player is disqualified
|
||||||
|
if( GAMESTATE->IsDisqualified(p) )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
Song* pSong = GAMESTATE->m_pCurSong;
|
||||||
|
Steps* pSteps = GAMESTATE->m_pCurSteps[p];
|
||||||
|
|
||||||
|
// whether or not to save scores when the stage was failed
|
||||||
|
// depends on if this is a course or not ... it's handled
|
||||||
|
// below in the switch
|
||||||
|
|
||||||
|
HighScore &hs = m_HighScore[p];
|
||||||
|
hs.sName = RANKING_TO_FILL_IN_MARKER[p];
|
||||||
|
hs.grade = stageStats.m_player[p].GetGrade();
|
||||||
|
hs.iScore = stageStats.m_player[p].iScore;
|
||||||
|
hs.fPercentDP = stageStats.m_player[p].GetPercentDancePoints();
|
||||||
|
hs.fSurviveSeconds = stageStats.m_player[p].fAliveSeconds;
|
||||||
|
hs.sModifiers = GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetString();
|
||||||
|
hs.dateTime = DateTime::GetNowDateTime();
|
||||||
|
hs.sPlayerGuid = PROFILEMAN->IsUsingProfile(p) ? PROFILEMAN->GetProfile(p)->m_sGuid : CString("");
|
||||||
|
hs.sMachineGuid = PROFILEMAN->GetMachineProfile()->m_sGuid;
|
||||||
|
hs.iProductID = PREFSMAN->m_iProductID;
|
||||||
|
memcpy( hs.iTapNoteScores, stageStats.m_player[p].iTapNoteScores, sizeof(hs.iTapNoteScores) );
|
||||||
|
memcpy( hs.iHoldNoteScores, stageStats.m_player[p].iHoldNoteScores, sizeof(hs.iHoldNoteScores) );
|
||||||
|
hs.radarValues = stageStats.m_player[p].radarActual;
|
||||||
|
|
||||||
|
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
|
||||||
|
|
||||||
|
switch( m_Type )
|
||||||
{
|
{
|
||||||
// don't save scores if the player is disqualified
|
case stage:
|
||||||
if( GAMESTATE->IsDisqualified(p) )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
Song* pSong = GAMESTATE->m_pCurSong;
|
|
||||||
Steps* pSteps = GAMESTATE->m_pCurSteps[p];
|
|
||||||
|
|
||||||
// whether or not to save scores when the stage was failed
|
|
||||||
// depends on if this is a course or not ... it's handled
|
|
||||||
// below in the switch
|
|
||||||
|
|
||||||
HighScore &hs = m_HighScore[p];
|
|
||||||
hs.sName = RANKING_TO_FILL_IN_MARKER[p];
|
|
||||||
hs.grade = stageStats.m_player[p].GetGrade();
|
|
||||||
hs.iScore = stageStats.m_player[p].iScore;
|
|
||||||
hs.fPercentDP = stageStats.m_player[p].GetPercentDancePoints();
|
|
||||||
hs.fSurviveSeconds = stageStats.m_player[p].fAliveSeconds;
|
|
||||||
hs.sModifiers = GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetString();
|
|
||||||
hs.dateTime = DateTime::GetNowDateTime();
|
|
||||||
hs.sPlayerGuid = PROFILEMAN->IsUsingProfile(p) ? PROFILEMAN->GetProfile(p)->m_sGuid : CString("");
|
|
||||||
hs.sMachineGuid = PROFILEMAN->GetMachineProfile()->m_sGuid;
|
|
||||||
hs.iProductID = PREFSMAN->m_iProductID;
|
|
||||||
memcpy( hs.iTapNoteScores, stageStats.m_player[p].iTapNoteScores, sizeof(hs.iTapNoteScores) );
|
|
||||||
memcpy( hs.iHoldNoteScores, stageStats.m_player[p].iHoldNoteScores, sizeof(hs.iHoldNoteScores) );
|
|
||||||
hs.radarValues = stageStats.m_player[p].radarActual;
|
|
||||||
|
|
||||||
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
|
|
||||||
|
|
||||||
switch( m_Type )
|
|
||||||
{
|
{
|
||||||
case stage:
|
// don't save scores for a failed song
|
||||||
{
|
if( stageStats.m_player[p].bFailed )
|
||||||
// don't save scores for a failed song
|
continue;
|
||||||
if( stageStats.m_player[p].bFailed )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
ASSERT( pSteps );
|
ASSERT( pSteps );
|
||||||
|
|
||||||
PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );
|
PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case summary:
|
|
||||||
{
|
|
||||||
// don't save scores if any stage was failed
|
|
||||||
if( stageStats.m_player[p].bFailed )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
int iAverageMeter = stageStats.GetAverageMeter(p);
|
|
||||||
rcOut[p] = AverageMeterToRankingCategory( iAverageMeter );
|
|
||||||
|
|
||||||
PROFILEMAN->AddCategoryScore( st, rcOut[p], p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );
|
|
||||||
|
|
||||||
// TRICKY: Increment play count here, and not on ScreenGameplay like the others.
|
|
||||||
PROFILEMAN->IncrementCategoryPlayCount( st, rcOut[p], p );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case course:
|
|
||||||
{
|
|
||||||
Course* pCourse = GAMESTATE->m_pCurCourse;
|
|
||||||
ASSERT( pCourse );
|
|
||||||
Trail* pTrail = GAMESTATE->m_pCurTrail[p];
|
|
||||||
|
|
||||||
PROFILEMAN->AddCourseScore( pCourse, pTrail, p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
ASSERT(0);
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case summary:
|
||||||
|
{
|
||||||
|
// don't save scores if any stage was failed
|
||||||
|
if( stageStats.m_player[p].bFailed )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
int iAverageMeter = stageStats.GetAverageMeter(p);
|
||||||
|
rcOut[p] = AverageMeterToRankingCategory( iAverageMeter );
|
||||||
|
|
||||||
|
PROFILEMAN->AddCategoryScore( st, rcOut[p], p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );
|
||||||
|
|
||||||
|
// TRICKY: Increment play count here, and not on ScreenGameplay like the others.
|
||||||
|
PROFILEMAN->IncrementCategoryPlayCount( st, rcOut[p], p );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case course:
|
||||||
|
{
|
||||||
|
Course* pCourse = GAMESTATE->m_pCurCourse;
|
||||||
|
ASSERT( pCourse );
|
||||||
|
Trail* pTrail = GAMESTATE->m_pCurTrail[p];
|
||||||
|
|
||||||
|
PROFILEMAN->AddCourseScore( pCourse, pTrail, p, hs, iPersonalHighScoreIndexOut[p], iMachineHighScoreIndexOut[p] );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ASSERT(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -988,124 +984,121 @@ void ScreenEvaluation::CommitScores(
|
|||||||
// If both players get a machine high score in the same HighScoreList,
|
// If both players get a machine high score in the same HighScoreList,
|
||||||
// then one player's score may have bumped the other player. Look in
|
// then one player's score may have bumped the other player. Look in
|
||||||
// the HighScoreList and re-get the high score index.
|
// the HighScoreList and re-get the high score index.
|
||||||
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
FOREACH_HumanPlayer( p )
|
if( iMachineHighScoreIndexOut[p] == -1 ) // no record
|
||||||
|
continue; // skip
|
||||||
|
|
||||||
|
HighScore &hs = m_HighScore[p];
|
||||||
|
Profile* pProfile = PROFILEMAN->GetMachineProfile();
|
||||||
|
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
|
||||||
|
|
||||||
|
const HighScoreList *pHSL = NULL;
|
||||||
|
switch( m_Type )
|
||||||
{
|
{
|
||||||
if( iMachineHighScoreIndexOut[p] == -1 ) // no record
|
case stage:
|
||||||
continue; // skip
|
|
||||||
|
|
||||||
HighScore &hs = m_HighScore[p];
|
|
||||||
Profile* pProfile = PROFILEMAN->GetMachineProfile();
|
|
||||||
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
|
|
||||||
|
|
||||||
const HighScoreList *pHSL = NULL;
|
|
||||||
switch( m_Type )
|
|
||||||
{
|
{
|
||||||
case stage:
|
Song* pSong = GAMESTATE->m_pCurSong;
|
||||||
{
|
Steps* pSteps = GAMESTATE->m_pCurSteps[p];
|
||||||
Song* pSong = GAMESTATE->m_pCurSong;
|
pHSL = &pProfile->GetStepsHighScoreList( pSong, pSteps );
|
||||||
Steps* pSteps = GAMESTATE->m_pCurSteps[p];
|
|
||||||
pHSL = &pProfile->GetStepsHighScoreList( pSong, pSteps );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case summary:
|
|
||||||
{
|
|
||||||
pHSL = &pProfile->GetCategoryHighScoreList( st, rcOut[p] );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case course:
|
|
||||||
{
|
|
||||||
Course* pCourse = GAMESTATE->m_pCurCourse;
|
|
||||||
ASSERT( pCourse );
|
|
||||||
Trail *pTrail = GAMESTATE->m_pCurTrail[p];
|
|
||||||
ASSERT( pTrail );
|
|
||||||
pHSL = &pProfile->GetCourseHighScoreList( pCourse, pTrail );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
ASSERT(0);
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
vector<HighScore>::const_iterator iter = find( pHSL->vHighScores.begin(), pHSL->vHighScores.end(), hs );
|
case summary:
|
||||||
if( iter == pHSL->vHighScores.end() )
|
{
|
||||||
iMachineHighScoreIndexOut[p] = -1;
|
pHSL = &pProfile->GetCategoryHighScoreList( st, rcOut[p] );
|
||||||
else
|
}
|
||||||
iMachineHighScoreIndexOut[p] = iter - pHSL->vHighScores.begin();
|
break;
|
||||||
|
case course:
|
||||||
|
{
|
||||||
|
Course* pCourse = GAMESTATE->m_pCurCourse;
|
||||||
|
ASSERT( pCourse );
|
||||||
|
Trail *pTrail = GAMESTATE->m_pCurTrail[p];
|
||||||
|
ASSERT( pTrail );
|
||||||
|
pHSL = &pProfile->GetCourseHighScoreList( pCourse, pTrail );
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ASSERT(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vector<HighScore>::const_iterator iter = find( pHSL->vHighScores.begin(), pHSL->vHighScores.end(), hs );
|
||||||
|
if( iter == pHSL->vHighScores.end() )
|
||||||
|
iMachineHighScoreIndexOut[p] = -1;
|
||||||
|
else
|
||||||
|
iMachineHighScoreIndexOut[p] = iter - pHSL->vHighScores.begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
LOG->Trace( "hand out awards" );
|
LOG->Trace( "hand out awards" );
|
||||||
|
|
||||||
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
FOREACH_HumanPlayer( p )
|
deque<PerDifficultyAward> &vPdas = GAMESTATE->m_vLastPerDifficultyAwards[p];
|
||||||
|
|
||||||
|
LOG->Trace( "per difficulty awards" );
|
||||||
|
|
||||||
|
// per-difficulty awards
|
||||||
|
switch( m_Type )
|
||||||
{
|
{
|
||||||
deque<PerDifficultyAward> &vPdas = GAMESTATE->m_vLastPerDifficultyAwards[p];
|
case stage:
|
||||||
|
case course:
|
||||||
LOG->Trace( "per difficulty awards" );
|
// don't give per-difficutly awards if using easy mods
|
||||||
|
if( !GAMESTATE->IsDisqualified(p) )
|
||||||
// per-difficulty awards
|
|
||||||
switch( m_Type )
|
|
||||||
{
|
{
|
||||||
case stage:
|
if( stageStats.m_player[p].FullComboOfScore( TNS_GREAT ) )
|
||||||
// don't give per-difficutly awards if using easy mods
|
vPdas.push_back( AWARD_FULL_COMBO_GREATS );
|
||||||
if( !GAMESTATE->IsDisqualified(p) )
|
if( stageStats.m_player[p].SingleDigitsOfScore( TNS_GREAT ) )
|
||||||
{
|
vPdas.push_back( AWARD_SINGLE_DIGIT_GREATS );
|
||||||
if( stageStats.m_player[p].FullComboOfScore( TNS_GREAT ) )
|
if( stageStats.m_player[p].FullComboOfScore( TNS_PERFECT ) )
|
||||||
vPdas.push_back( AWARD_FULL_COMBO_GREATS );
|
vPdas.push_back( AWARD_FULL_COMBO_PERFECTS );
|
||||||
if( stageStats.m_player[p].SingleDigitsOfScore( TNS_GREAT ) )
|
if( stageStats.m_player[p].SingleDigitsOfScore( TNS_PERFECT ) )
|
||||||
vPdas.push_back( AWARD_SINGLE_DIGIT_GREATS );
|
vPdas.push_back( AWARD_SINGLE_DIGIT_PERFECTS );
|
||||||
if( stageStats.m_player[p].FullComboOfScore( TNS_PERFECT ) )
|
if( stageStats.m_player[p].FullComboOfScore( TNS_MARVELOUS ) )
|
||||||
vPdas.push_back( AWARD_FULL_COMBO_PERFECTS );
|
vPdas.push_back( AWARD_FULL_COMBO_MARVELOUSES );
|
||||||
if( stageStats.m_player[p].SingleDigitsOfScore( TNS_PERFECT ) )
|
|
||||||
vPdas.push_back( AWARD_SINGLE_DIGIT_PERFECTS );
|
|
||||||
if( stageStats.m_player[p].FullComboOfScore( TNS_MARVELOUS ) )
|
|
||||||
vPdas.push_back( AWARD_FULL_COMBO_MARVELOUSES );
|
|
||||||
|
|
||||||
if( stageStats.m_player[p].OneOfScore( TNS_GREAT ) )
|
if( stageStats.m_player[p].OneOfScore( TNS_GREAT ) )
|
||||||
vPdas.push_back( AWARD_ONE_GREAT );
|
vPdas.push_back( AWARD_ONE_GREAT );
|
||||||
if( stageStats.m_player[p].OneOfScore( TNS_PERFECT ) )
|
if( stageStats.m_player[p].OneOfScore( TNS_PERFECT ) )
|
||||||
vPdas.push_back( AWARD_ONE_PERFECT );
|
vPdas.push_back( AWARD_ONE_PERFECT );
|
||||||
|
|
||||||
float fPercentGreats = stageStats.m_player[p].GetPercentageOfTaps( TNS_GREAT );
|
float fPercentGreats = stageStats.m_player[p].GetPercentageOfTaps( TNS_GREAT );
|
||||||
if( fPercentGreats >= 0.8f )
|
if( fPercentGreats >= 0.8f )
|
||||||
vPdas.push_back( AWARD_GREATS_80_PERCENT );
|
vPdas.push_back( AWARD_GREATS_80_PERCENT );
|
||||||
if( fPercentGreats >= 0.9f )
|
if( fPercentGreats >= 0.9f )
|
||||||
vPdas.push_back( AWARD_GREATS_90_PERCENT );
|
vPdas.push_back( AWARD_GREATS_90_PERCENT );
|
||||||
if( fPercentGreats >= 1.f )
|
if( fPercentGreats >= 1.f )
|
||||||
vPdas.push_back( AWARD_GREATS_100_PERCENT );
|
vPdas.push_back( AWARD_GREATS_100_PERCENT );
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Max one PDA per stage
|
|
||||||
if( !vPdas.empty() )
|
|
||||||
vPdas.erase( vPdas.begin(), vPdas.end()-1 );
|
|
||||||
|
|
||||||
if( !vPdas.empty() )
|
|
||||||
pdaToShowOut[p] = vPdas.back();
|
|
||||||
|
|
||||||
LOG->Trace( "done with per difficulty awards" );
|
|
||||||
|
|
||||||
// DO give peak combo awards if using easy mods
|
|
||||||
int iComboAtStartOfStage = stageStats.m_player[p].GetComboAtStartOfStage();
|
|
||||||
int iPeakCombo = stageStats.m_player[p].GetMaxCombo().cnt;
|
|
||||||
|
|
||||||
FOREACH_PeakComboAward( pca )
|
|
||||||
{
|
|
||||||
int iLevel = 1000 * (pca+1);
|
|
||||||
bool bCrossedLevel = iComboAtStartOfStage < iLevel && iPeakCombo >= iLevel;
|
|
||||||
LOG->Trace( "pca = %d, iLevel = %d, bCrossedLevel = %d", pca, iLevel, bCrossedLevel );
|
|
||||||
if( bCrossedLevel )
|
|
||||||
{
|
|
||||||
GAMESTATE->m_vLastPeakComboAwards[p].push_back( pca );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !GAMESTATE->m_vLastPeakComboAwards[p].empty() )
|
|
||||||
pcaToShowOut[p] = GAMESTATE->m_vLastPeakComboAwards[p].back();
|
|
||||||
|
|
||||||
LOG->Trace( "done with per combo awards" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Max one PDA per stage
|
||||||
|
if( !vPdas.empty() )
|
||||||
|
vPdas.erase( vPdas.begin(), vPdas.end()-1 );
|
||||||
|
|
||||||
|
if( !vPdas.empty() )
|
||||||
|
pdaToShowOut[p] = vPdas.back();
|
||||||
|
|
||||||
|
LOG->Trace( "done with per difficulty awards" );
|
||||||
|
|
||||||
|
// DO give peak combo awards if using easy mods
|
||||||
|
int iComboAtStartOfStage = stageStats.m_player[p].GetComboAtStartOfStage();
|
||||||
|
int iPeakCombo = stageStats.m_player[p].GetMaxCombo().cnt;
|
||||||
|
|
||||||
|
FOREACH_PeakComboAward( pca )
|
||||||
|
{
|
||||||
|
int iLevel = 1000 * (pca+1);
|
||||||
|
bool bCrossedLevel = iComboAtStartOfStage < iLevel && iPeakCombo >= iLevel;
|
||||||
|
LOG->Trace( "pca = %d, iLevel = %d, bCrossedLevel = %d", pca, iLevel, bCrossedLevel );
|
||||||
|
if( bCrossedLevel )
|
||||||
|
{
|
||||||
|
GAMESTATE->m_vLastPeakComboAwards[p].push_back( pca );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if( !GAMESTATE->m_vLastPeakComboAwards[p].empty() )
|
||||||
|
pcaToShowOut[p] = GAMESTATE->m_vLastPeakComboAwards[p].back();
|
||||||
|
|
||||||
|
LOG->Trace( "done with per combo awards" );
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG->Trace( "done handing out awards." );
|
LOG->Trace( "done handing out awards." );
|
||||||
|
|||||||
@@ -769,7 +769,7 @@ bool ScreenGameplay::IsLastSong()
|
|||||||
{
|
{
|
||||||
if( GAMESTATE->m_pCurCourse && GAMESTATE->m_pCurCourse->m_bRepeat )
|
if( GAMESTATE->m_pCurCourse && GAMESTATE->m_pCurCourse->m_bRepeat )
|
||||||
return false;
|
return false;
|
||||||
return GAMESTATE->GetCourseSongIndex()+1 == (int)m_apSongsQueue.size(); // GetCourseSongIndex() is 0-based but size() is not
|
return GAMESTATE->GetCourseSongIndex() >= (int)m_apSongsQueue.size()-1; // GetCourseSongIndex() is 0-based
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
|
void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
|
||||||
@@ -2090,10 +2090,10 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
else if( SM == SM_NotesEnded ) // received while STATE_DANCING
|
else if( SM == SM_NotesEnded ) // received while STATE_DANCING
|
||||||
{
|
{
|
||||||
/* Do this in LoadNextSong, so we don't tween off old attacks until
|
/* Do this in LoadNextSong, so we don't tween off old attacks until
|
||||||
* m_NextSong finishes. */
|
* m_NextSong finishes. */
|
||||||
// GAMESTATE->RemoveAllActiveAttacks();
|
// GAMESTATE->RemoveAllActiveAttacks();
|
||||||
|
|
||||||
FOREACH_EnabledPlayer(p)
|
FOREACH_EnabledPlayer(p)
|
||||||
{
|
{
|
||||||
/* If either player's passmark is enabled, check it. */
|
/* If either player's passmark is enabled, check it. */
|
||||||
if( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.m_fPassmark > 0 &&
|
if( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.m_fPassmark > 0 &&
|
||||||
@@ -2116,7 +2116,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* If all players have *really* failed (bFailed, not the life meter or
|
/* If all players have *really* failed (bFailed, not the life meter or
|
||||||
* bFailedEarlier): */
|
* bFailedEarlier): */
|
||||||
const bool bAllReallyFailed = STATSMAN->m_CurStageStats.AllFailed();
|
const bool bAllReallyFailed = STATSMAN->m_CurStageStats.AllFailed();
|
||||||
|
|
||||||
|
|
||||||
@@ -2135,15 +2135,17 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
// update dancing characters for win / lose
|
// update dancing characters for win / lose
|
||||||
DancingCharacters *Dancers = m_SongBackground.GetDancingCharacters();
|
DancingCharacters *Dancers = m_SongBackground.GetDancingCharacters();
|
||||||
if( Dancers )
|
if( Dancers )
|
||||||
FOREACH_EnabledPlayer(p)
|
|
||||||
{
|
{
|
||||||
/* XXX: In battle modes, switch( GAMESTATE->GetStageResult(p) ). */
|
FOREACH_EnabledPlayer(p)
|
||||||
if( STATSMAN->m_CurStageStats.m_player[p].bFailed )
|
{
|
||||||
Dancers->Change2DAnimState( p, AS2D_FAIL ); // fail anim
|
/* XXX: In battle modes, switch( GAMESTATE->GetStageResult(p) ). */
|
||||||
else if( m_pLifeMeter[p] && m_pLifeMeter[p]->GetLife() == 1.0f ) // full life
|
if( STATSMAN->m_CurStageStats.m_player[p].bFailed )
|
||||||
Dancers->Change2DAnimState( p, AS2D_WINFEVER ); // full life pass anim
|
Dancers->Change2DAnimState( p, AS2D_FAIL ); // fail anim
|
||||||
else
|
else if( m_pLifeMeter[p] && m_pLifeMeter[p]->GetLife() == 1.0f ) // full life
|
||||||
Dancers->Change2DAnimState( p, AS2D_WIN ); // pass anim
|
Dancers->Change2DAnimState( p, AS2D_WINFEVER ); // full life pass anim
|
||||||
|
else
|
||||||
|
Dancers->Change2DAnimState( p, AS2D_WIN ); // pass anim
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* End round. */
|
/* End round. */
|
||||||
|
|||||||
Reference in New Issue
Block a user