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

To2sAnd3s, From2sAnd3s

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-04 03:12:45 +00:00
parent 23bf8cb1ca
commit 7d4ef141dc
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+9 -3
View File
@@ -366,10 +366,16 @@ void NoteData::ConvertHoldNotesTo2sAnd3s()
} }
void NoteData::Get2sAnd3s( NoteData &out ) const void NoteData::To2sAnd3s( const NoteData &out )
{ {
out.CopyAll( this ); CopyAll( &out );
out.ConvertHoldNotesTo2sAnd3s(); ConvertHoldNotesTo2sAnd3s();
}
void NoteData::From2sAnd3s( const NoteData &out )
{
CopyAll( &out );
Convert2sAnd3sToHoldNotes();
} }
/* "104444001" == /* "104444001" ==
stepmania/src/NoteData.h
+2 -1
View File
@@ -130,7 +130,8 @@ public:
// Convert between HoldNote representation and '2' and '3' markers in TapNotes // Convert between HoldNote representation and '2' and '3' markers in TapNotes
void Convert2sAnd3sToHoldNotes(); void Convert2sAnd3sToHoldNotes();
void ConvertHoldNotesTo2sAnd3s(); void ConvertHoldNotesTo2sAnd3s();
void Get2sAnd3s( NoteData &out ) const; void To2sAnd3s( const NoteData &out );
void From2sAnd3s( const NoteData &out );
void Convert4sToHoldNotes(); void Convert4sToHoldNotes();
void ConvertHoldNotesTo4s(); void ConvertHoldNotesTo4s();
stepmania/src/NoteDataUtil.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData
void NoteDataUtil::GetSMNoteDataString( const NoteData &in_, CString &out ) void NoteDataUtil::GetSMNoteDataString( const NoteData &in_, CString &out )
{ {
NoteData in; NoteData in;
in_.Get2sAnd3s( in ); in.To2sAnd3s( in_ );
float fLastBeat = in.GetLastBeat(); float fLastBeat = in.GetLastBeat();
int iLastMeasure = int( fLastBeat/BEATS_PER_MEASURE ); int iLastMeasure = int( fLastBeat/BEATS_PER_MEASURE );