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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScoreKeeperNormal.cpp
+4 -4
View File
@@ -62,9 +62,9 @@ void ScoreKeeperNormal::Load(
for( unsigned i=0; i<apSteps.size(); i++ )
{
Song* pSong = apSongs[i];
ASSERT( pSong != NULL );
ASSERT( pSong != nullptr );
Steps* pSteps = apSteps[i];
ASSERT( pSteps != NULL );
ASSERT( pSteps != nullptr );
const AttackArray &aa = asModifiers[i];
NoteData ndTemp;
pSteps->GetNoteData( ndTemp );
@@ -94,7 +94,7 @@ void ScoreKeeperNormal::Load(
GAMESTATE->SetProcessedTimingData(pSteps->GetTimingData()); // XXX: Not sure why but NoteDataUtil::CalculateRadarValues segfaults without this
iTotalPossibleDancePoints += this->GetPossibleDancePoints( &ndPre, &ndPost, pSteps->GetTimingData(), pSong->m_fMusicLengthSeconds );
iTotalPossibleGradePoints += this->GetPossibleGradePoints( &ndPre, &ndPost, pSteps->GetTimingData(), pSong->m_fMusicLengthSeconds );
GAMESTATE->SetProcessedTimingData(NULL);
GAMESTATE->SetProcessedTimingData(nullptr);
}
m_pPlayerStageStats->m_iPossibleDancePoints = iTotalPossibleDancePoints;
@@ -196,7 +196,7 @@ void ScoreKeeperNormal::OnNextSong( int iSongInCourseIndex, const Steps* pSteps,
m_iTapNotesHit = 0;
GAMESTATE->SetProcessedTimingData(NULL);
GAMESTATE->SetProcessedTimingData(nullptr);
}
static int GetScore(int p, int Z, int64_t S, int n)