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

[splittiming] merge

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-05-12 16:56:15 +07:00
parent eda727ddf9 68b391481d
commit 2507cf7c0a
55 changed files with 1254 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+5 -7
View File
@@ -2623,9 +2623,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_BackFromDifficultyMeterChange )
{
int i;
std::istringstream ss( ScreenTextEntry::s_sLastAnswer );
ss >> i;
int i = StringToInt( ScreenTextEntry::s_sLastAnswer );
GAMESTATE->m_pCurSteps[PLAYER_1]->SetMeter(i);
SetDirty( true );
}
@@ -2652,7 +2650,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_BackFromTimeSignatureNumeratorChange )
{
int iNum = atoi( ScreenTextEntry::s_sLastAnswer );
int iNum = StringToInt( ScreenTextEntry::s_sLastAnswer );
if( iNum > 0 )
{
m_pSteps->m_Timing.SetTimeSignatureNumeratorAtBeat( GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat, iNum );
@@ -2661,7 +2659,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if ( SM == SM_BackFromTimeSignatureDenominatorChange )
{
int iDen = atoi( ScreenTextEntry::s_sLastAnswer );
int iDen = StringToInt( ScreenTextEntry::s_sLastAnswer );
if( iDen > 0)
{
m_pSteps->m_Timing.SetTimeSignatureDenominatorAtBeat( GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat, iDen );
@@ -2670,7 +2668,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if ( SM == SM_BackFromTickcountChange )
{
int iTick = atoi( ScreenTextEntry::s_sLastAnswer );
int iTick = StringToInt( ScreenTextEntry::s_sLastAnswer );
if ( iTick >= 0 && iTick <= ROWS_PER_BEAT )
{
m_pSteps->m_Timing.SetTickcountAtBeat( GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat, iTick );
@@ -2679,7 +2677,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if ( SM == SM_BackFromComboChange )
{
int iCombo = atoi( ScreenTextEntry::s_sLastAnswer );
int iCombo = StringToInt( ScreenTextEntry::s_sLastAnswer );
if ( iCombo >= 0 )
{
m_pSteps->m_Timing.SetComboAtBeat( GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat, iCombo );