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/NoteDataUtil.cpp
+18 -18
View File
@@ -8,7 +8,6 @@
#include "Style.h"
#include "GameState.h"
#include "RadarValues.h"
#include "Foreach.h"
#include "TimingData.h"
#include <utility>
@@ -351,18 +350,19 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
SplitCompositeNoteData( in, parts );
FOREACH( NoteData, parts, nd )
for (NoteData &nd : parts)
{
InsertHoldTails( *nd );
fLastBeat = max( fLastBeat, nd->GetLastBeat() );
InsertHoldTails( nd );
fLastBeat = max( fLastBeat, nd.GetLastBeat() );
}
int iLastMeasure = int( fLastBeat/BEATS_PER_MEASURE );
sRet = "";
FOREACH( NoteData, parts, nd )
int partNum = 0;
for (NoteData const &nd : parts)
{
if( nd != parts.begin() )
if( partNum++ != 0 )
sRet.append( "&\n" );
for( int m = 0; m <= iLastMeasure; ++m ) // foreach measure
{
@@ -370,7 +370,7 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
sRet.append( 1, ',' );
sRet += ssprintf(" // measure %d\n", m);
NoteType nt = GetSmallestNoteTypeForMeasure( *nd, m );
NoteType nt = GetSmallestNoteTypeForMeasure( nd, m );
int iRowSpacing;
if( nt == NoteType_Invalid )
iRowSpacing = 1;
@@ -384,9 +384,9 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
for( int r=iMeasureStartRow; r<=iMeasureLastRow; r+=iRowSpacing )
{
for( int t = 0; t < nd->GetNumTracks(); ++t )
for( int t = 0; t < nd.GetNumTracks(); ++t )
{
const TapNote &tn = nd->GetTapNote(t, r);
const TapNote &tn = nd.GetTapNote(t, r);
char c;
switch( tn.type )
{
@@ -458,7 +458,7 @@ void NoteDataUtil::SplitCompositeNoteData( const NoteData &in, vector<NoteData>
Hopefully this hack can be removed soon. -- Jason "Wolfman2000" Felds
*/
const Style *curStyle = GAMESTATE->GetCurrentStyle(PLAYER_INVALID);
if( (curStyle == NULL || curStyle->m_StyleType == StyleType_TwoPlayersSharedSides )
if( (curStyle == nullptr || curStyle->m_StyleType == StyleType_TwoPlayersSharedSides )
&& int( tn.pn ) > NUM_PlayerNumber )
{
tn.pn = PLAYER_1;
@@ -474,13 +474,13 @@ void NoteDataUtil::SplitCompositeNoteData( const NoteData &in, vector<NoteData>
void NoteDataUtil::CombineCompositeNoteData( NoteData &out, const vector<NoteData> &in )
{
FOREACH_CONST( NoteData, in, nd )
for (NoteData const &nd : in)
{
const int iMaxTracks = min( out.GetNumTracks(), nd->GetNumTracks() );
const int iMaxTracks = min( out.GetNumTracks(), nd.GetNumTracks() );
for( int track = 0; track < iMaxTracks; ++track )
{
for( NoteData::const_iterator i = nd->begin(track); i != nd->end(track); ++i )
for( NoteData::const_iterator i = nd.begin(track); i != nd.end(track); ++i )
{
int row = i->first;
if( out.IsHoldNoteAtRow(track, i->first) )
@@ -1219,8 +1219,8 @@ void NoteDataUtil::RemoveSimultaneousNotes( NoteData &in, int iMaxSimultaneous,
vector<NoteData> vParts;
SplitCompositeNoteData( in, vParts );
FOREACH( NoteData, vParts, nd )
RemoveSimultaneousNotes( *nd, iMaxSimultaneous, iStartIndex, iEndIndex );
for (NoteData &nd : vParts)
RemoveSimultaneousNotes( nd, iMaxSimultaneous, iStartIndex, iEndIndex );
in.Init();
in.SetNumTracks( vParts.front().GetNumTracks() );
CombineCompositeNoteData( in, vParts );
@@ -2720,14 +2720,14 @@ void NoteDataUtil::ConvertAdditionsToRegular( NoteData &inout )
void NoteDataUtil::TransformNoteData(NoteData &nd, TimingData const& timing_data, const AttackArray &aa, StepsType st, Song* pSong)
{
FOREACH_CONST( Attack, aa, a )
for (Attack const &a : aa)
{
PlayerOptions po;
po.FromString( a->sModifiers );
po.FromString( a.sModifiers );
if( po.ContainsTransformOrTurn() )
{
float fStartBeat, fEndBeat;
a->GetAttackBeats( pSong, fStartBeat, fEndBeat );
a.GetAttackBeats( pSong, fStartBeat, fEndBeat );
NoteDataUtil::TransformNoteData(nd, timing_data, po, st, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) );
}