fix HoldNote compile errors/warnings
This commit is contained in:
@@ -341,8 +341,7 @@ void NoteData::Convert2sAnd3sToHoldNotes()
|
||||
|
||||
SetTapNote(col, j, TAP_EMPTY);
|
||||
|
||||
HoldNote hn = { col, NoteRowToBeat(i), NoteRowToBeat(j) };
|
||||
AddHoldNote( hn );
|
||||
AddHoldNote( HoldNote(col, NoteRowToBeat(i), NoteRowToBeat(j)) );
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -385,7 +384,7 @@ void NoteData::Convert4sToHoldNotes()
|
||||
if( GetTapNote(col, i) != TAP_HOLD ) // this is a HoldNote body
|
||||
continue;
|
||||
|
||||
HoldNote hn = { col, NoteRowToBeat(i), 0 };
|
||||
HoldNote hn( col, NoteRowToBeat(i), 0 );
|
||||
// search for end of HoldNote
|
||||
do {
|
||||
SetTapNote(col, i, TAP_EMPTY);
|
||||
|
||||
@@ -75,6 +75,7 @@ CString NoteTypeToString( NoteType nt );
|
||||
|
||||
struct HoldNote
|
||||
{
|
||||
HoldNote( int t, float s, float e ) { iTrack=t; fStartBeat=s; fEndBeat=e; }
|
||||
int iTrack;
|
||||
float fStartBeat;
|
||||
float fEndBeat;
|
||||
|
||||
@@ -125,11 +125,11 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Notes &out )
|
||||
|
||||
if( iHoldStartRow[t] != -1 ) // this ends the hold
|
||||
{
|
||||
HoldNote hn = {
|
||||
HoldNote hn (
|
||||
t, /* button */
|
||||
iHoldStartRow[t]/(float)iTickCount, /* start */
|
||||
(r-1)/(float)iTickCount /* end */
|
||||
};
|
||||
);
|
||||
notedata.AddHoldNote( hn );
|
||||
iHoldStartRow[t] = -1;
|
||||
}
|
||||
|
||||
@@ -380,7 +380,7 @@ void ScreenEdit::Update( float fDeltaTime )
|
||||
fEndBeat = froundf( fEndBeat, NoteTypeToBeat(m_SnapDisplay.GetNoteType()) );
|
||||
|
||||
// create a new hold note
|
||||
HoldNote newHN = { t, fStartBeat, fEndBeat };
|
||||
HoldNote newHN( t, fStartBeat, fEndBeat );
|
||||
m_NoteFieldRecord.AddHoldNote( newHN );
|
||||
}
|
||||
}
|
||||
@@ -684,10 +684,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
|
||||
continue;
|
||||
|
||||
// create a new hold note
|
||||
HoldNote newHN;
|
||||
newHN.iTrack = col;
|
||||
newHN.fStartBeat = min(fStartBeat, fEndBeat);
|
||||
newHN.fEndBeat = max(fStartBeat, fEndBeat);
|
||||
HoldNote newHN( col, min(fStartBeat, fEndBeat), max(fStartBeat, fEndBeat) );
|
||||
|
||||
newHN.fStartBeat = max(newHN.fStartBeat, 0);
|
||||
newHN.fEndBeat = max(newHN.fEndBeat, 0);
|
||||
|
||||
Reference in New Issue
Block a user