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

Forced a merge. Should be good.

Browse Source
This commit is contained in:
Jason Felds
2013-04-18 22:58:30 -04:00
parent 5d5875904d 05cf6d8cd8
commit 489a9312fc
8 changed files with 201 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+10
View File
@@ -847,9 +847,13 @@ void Song::ReCalculateRadarValuesAndLastSecond(bool fromCache, bool duringCache)
{
if( fromCache && this->GetFirstSecond() >= 0 && this->GetLastSecond() > 0 )
{
this->m_SongTiming.SetLastRowFromTime(this->GetLastSecond());
// this is loaded from cache, then we just have to calculate the radar values.
for( unsigned i=0; i<m_vpSteps.size(); i++ )
{
m_vpSteps[i]->CalculateRadarValues( m_fMusicLengthSeconds );
m_vpSteps[i]->m_Timing.SetLastRowFromTime(this->GetLastSecond());
}
return;
}
@@ -904,6 +908,12 @@ void Song::ReCalculateRadarValuesAndLastSecond(bool fromCache, bool duringCache)
// Yes, for some reason we can have freaky stuff take place here.
this->firstSecond = (localFirst < localLast) ? localFirst : 0;
this->lastSecond = localLast;
this->m_SongTiming.SetLastRowFromTime(localLast);
for( unsigned i = 0; i < this->m_vpSteps.size(); ++i)
{
this->m_vpSteps[i]->m_Timing.SetLastRowFromTime(localLast);
}
}
// Return whether the song is playable in the given style.