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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-30 05:33:47 +00:00
parent 6409c606ec
commit 24a6df7b9d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+4 -4
View File
@@ -3301,10 +3301,10 @@ void ScreenEdit::HandleBGChangeChoice( BGChangeChoice c, const vector<int> &iAns
newChange.m_fStartBeat = GAMESTATE->m_fSongBeat; newChange.m_fStartBeat = GAMESTATE->m_fSongBeat;
newChange.m_fRate = StringToFloat( g_BackgroundChange.rows[rate].choices[iAnswers[rate]] )/100.f; newChange.m_fRate = StringToFloat( g_BackgroundChange.rows[rate].choices[iAnswers[rate]] )/100.f;
newChange.m_sTransition = iAnswers[transition] ? g_BackgroundChange.rows[transition].choices[iAnswers[transition]] : EMPTY_STRING; newChange.m_sTransition = iAnswers[transition] ? g_BackgroundChange.rows[transition].choices[iAnswers[transition]] : RString();
newChange.m_def.m_sEffect = iAnswers[effect] ? g_BackgroundChange.rows[effect].choices[iAnswers[effect]] : EMPTY_STRING; newChange.m_def.m_sEffect = iAnswers[effect] ? g_BackgroundChange.rows[effect].choices[iAnswers[effect]] : RString();
newChange.m_def.m_sColor1 = iAnswers[color1] ? g_BackgroundChange.rows[color1].choices[iAnswers[color1]] : EMPTY_STRING; newChange.m_def.m_sColor1 = iAnswers[color1] ? g_BackgroundChange.rows[color1].choices[iAnswers[color1]] : RString();
newChange.m_def.m_sColor2 = iAnswers[color2] ? g_BackgroundChange.rows[color2].choices[iAnswers[color2]] : EMPTY_STRING; newChange.m_def.m_sColor2 = iAnswers[color2] ? g_BackgroundChange.rows[color2].choices[iAnswers[color2]] : RString();
switch( iAnswers[file1_type] ) switch( iAnswers[file1_type] )
{ {
DEFAULT_FAIL( iAnswers[file1_type] ); DEFAULT_FAIL( iAnswers[file1_type] );
stepmania/src/Steps.cpp
+5 -5
View File
@@ -77,9 +77,9 @@ void Steps::SetNoteData( const NoteData& noteDataNew )
*m_pNoteData = noteDataNew; *m_pNoteData = noteDataNew;
m_bNoteDataIsFilled = true; m_bNoteDataIsFilled = true;
m_sNoteDataCompressed = EMPTY_STRING; m_sNoteDataCompressed = RString();
m_iHash = 0; m_iHash = 0;
m_sFilename = EMPTY_STRING; // We can no longer read from the file because it has changed in memory. m_sFilename = RString(); // We can no longer read from the file because it has changed in memory.
} }
void Steps::GetNoteData( NoteData& noteDataOut ) const void Steps::GetNoteData( NoteData& noteDataOut ) const
@@ -104,7 +104,7 @@ void Steps::SetSMNoteData( const RString &notes_comp_ )
m_sNoteDataCompressed = notes_comp_; m_sNoteDataCompressed = notes_comp_;
m_iHash = 0; m_iHash = 0;
m_sFilename = EMPTY_STRING; // We can no longer read from the file because it has changed in memory. m_sFilename = RString(); // We can no longer read from the file because it has changed in memory.
} }
/* XXX: this function should pull data from m_sFilename, like Decompress() */ /* XXX: this function should pull data from m_sFilename, like Decompress() */
@@ -278,7 +278,7 @@ void Steps::Compress() const
/* Always leave lights data uncompressed. */ /* Always leave lights data uncompressed. */
if( this->m_StepsType == STEPS_TYPE_LIGHTS_CABINET && m_bNoteDataIsFilled ) if( this->m_StepsType == STEPS_TYPE_LIGHTS_CABINET && m_bNoteDataIsFilled )
{ {
m_sNoteDataCompressed = EMPTY_STRING; m_sNoteDataCompressed = RString();
return; return;
} }
@@ -297,7 +297,7 @@ void Steps::Compress() const
/* Be careful; 'x = ""', m_sNoteDataCompressed.clear() and m_sNoteDataCompressed.reserve(0) /* Be careful; 'x = ""', m_sNoteDataCompressed.clear() and m_sNoteDataCompressed.reserve(0)
* don't always free the allocated memory. */ * don't always free the allocated memory. */
m_sNoteDataCompressed = EMPTY_STRING; m_sNoteDataCompressed = RString();
return; return;
} }