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

Added a ton of spaces upon Steves extremely polite request.

Browse Source
This commit is contained in:
Andrew Livy
2009-05-23 11:26:01 +00:00
parent b87e3c705d
commit 561a9a2ab4
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+2 -2
View File
@@ -364,10 +364,10 @@ void MusicWheel::GetSongList( vector<Song*> &arraySongs, SortOrder so, const RSt
continue;
if(PREFSMAN->m_bOnlyPreferredDifficulties)
if( PREFSMAN->m_bOnlyPreferredDifficulties )
{
// if the song has steps that fit the preferred difficulty of the default player
if(pSong->HasStepsTypeAndDifficulty(GAMESTATE->GetCurrentStyle()->m_StepsType,GAMESTATE->m_PreferredDifficulty[GAMESTATE->GetFirstHumanPlayer()]) )
if( pSong->HasStepsTypeAndDifficulty( GAMESTATE->GetCurrentStyle()->m_StepsType,GAMESTATE->m_PreferredDifficulty[GAMESTATE->GetFirstHumanPlayer()] ) )
arraySongs.push_back( pSong );
}
else
stepmania/src/ScreenGameplay.cpp
+6 -8
View File
@@ -759,9 +759,7 @@ void ScreenGameplay::Init()
m_GiveUpTimer.SetZero();
// friez
if(USE_ALTERNATIVE_INPUT) // using alternative input
if( USE_ALTERNATIVE_INPUT ) // using alternative input
{
int iNumCols = GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer;
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
@@ -774,17 +772,17 @@ void ScreenGameplay::Init()
// Dialog::OK(GameI.ToString(INPUTMAPPER->GetInputScheme()),"DEBUG");
ThemeMetric<RString> tmpMetric;
tmpMetric.Load(m_sName,ssprintf("AltInp%s%s",GAMESTATE->GetCurrentStyle()->m_szName,GameI.ToString( INPUTMAPPER->GetInputScheme() ).c_str() ) );
tmpMetric.Load( m_sName,ssprintf("AltInp%s%s",GAMESTATE->GetCurrentStyle()->m_szName,GameI.ToString( INPUTMAPPER->GetInputScheme() ).c_str() ) );
if(tmpMetric.GetValue() != "")
{
GameInput GameIAlt;
GameIAlt.FromString(INPUTMAPPER->GetInputScheme(),tmpMetric.GetValue());
GameIAlt.FromString( INPUTMAPPER->GetInputScheme(),tmpMetric.GetValue() );
AlternateMapping tmpMap;
tmpMap.inpMain = GameI;
tmpMap.inpAlt = GameIAlt;
m_vAlterMap.push_back(tmpMap);
m_vAlterMap.push_back( tmpMap );
}
}
}
@@ -2248,11 +2246,11 @@ void ScreenGameplay::Input( const InputEventPlus &input )
int iCol = GAMESTATE->GetCurrentStyle()->GameInputToColumn( input.GameI );
if(USE_ALTERNATIVE_INPUT) // using alternative input
if( USE_ALTERNATIVE_INPUT ) // using alternative input
{
for( unsigned int i=0; i < m_vAlterMap.size(); ++i )
{
if(m_vAlterMap[i].inpAlt == input.GameI)
if( m_vAlterMap[i].inpAlt == input.GameI )
{
iCol = GAMESTATE->GetCurrentStyle()->GameInputToColumn( m_vAlterMap[i].inpMain );
}
stepmania/src/StreamDisplay.cpp
+18 -18
View File
@@ -48,20 +48,20 @@ void StreamDisplay::Load( const RString &_sMetricsGroup )
{
Sprite *pSpr = new Sprite;
if(m_bUsingThreePart)
if( m_bUsingThreePart )
{
pSpr->Load( THEME->GetPathG(sMetricsGroup,ssprintf("%s part%d",StreamTypeToString(st).c_str(),i) ) );
pSpr->Load( THEME->GetPathG( sMetricsGroup,ssprintf( "%s part%d", StreamTypeToString(st).c_str(),i ) ) );
if(pSpr->GetNumStates() > 1)
{
pSpr->SetAllStateDelays(THEME->GetMetricF(sMetricsGroup,ssprintf("%spart%ddelay",StreamTypeToString(st).c_str(),i)));
pSpr->SetAllStateDelays( THEME->GetMetricF( sMetricsGroup, ssprintf( "%spart%ddelay", StreamTypeToString(st).c_str(),i ) ) );
}
}
else
pSpr->Load( THEME->GetPathG(sMetricsGroup,StreamTypeToString(st)) );
pSpr->Load( THEME->GetPathG( sMetricsGroup, StreamTypeToString(st) ) );
m_vpSprPill[st].push_back( pSpr );
if(!m_bUsingThreePart)
if( !m_bUsingThreePart )
{
m_transformPill.TransformItemDirect( *pSpr, -1, i, iNumPills );
float f = 1 / fTextureCoordScaleX;
@@ -71,11 +71,11 @@ void StreamDisplay::Load( const RString &_sMetricsGroup )
this->AddChild( pSpr );
}
if(m_bUsingThreePart)
if( m_bUsingThreePart )
{
m_fThreePartWidth = THEME->GetMetricF(sMetricsGroup,"ThreePartWidth");
m_fThreePartWidth = THEME->GetMetricF( sMetricsGroup, "ThreePartWidth" );
// first element positioned depending on metric width specified
m_vpSprPill[st][0]->AddX(-(m_fThreePartWidth/2 + m_vpSprPill[st][0]->GetZoomedWidth()/2));
m_vpSprPill[st][0]->AddX( -( m_fThreePartWidth/2 + m_vpSprPill[st][0]->GetZoomedWidth()/2 ) );
}
}
}
@@ -107,8 +107,8 @@ void StreamDisplay::Update( float fDeltaSecs )
m_fVelocity += fSpringForce * fDeltaSecs;
const float fViscousForce = -m_fVelocity * 0.2f;
if(!m_bAlwaysBounce)
m_fVelocity += fViscousForce * fDeltaSecs;
if( !m_bAlwaysBounce )
m_fVelocity += fViscousForce * fDeltaSecs;
}
CLAMP( m_fVelocity, -.06f, +.02f );
@@ -133,26 +133,26 @@ void StreamDisplay::Update( float fDeltaSecs )
// XXX scale by current song speed
if(!m_bUsingThreePart) // usual lifebar
if( !m_bUsingThreePart ) // usual lifebar
{
pSpr->SetCropRight( 1.0f - fPercentFilledThisPill );
pSpr->SetTexCoordVelocity(-1,0);
pSpr->SetTexCoordVelocity( -1,0 );
}
else // using the three-part method
{
if(i==1) // middle pill
if( i==1 ) // middle pill
{
float fMiddleWidth = m_fThreePartWidth * m_fTrailingPercent;
pSpr->ZoomToWidth(fMiddleWidth);
pSpr->ZoomToWidth( fMiddleWidth );
float fMiddleX = m_vpSprPill[st][0]->GetX() + (fMiddleWidth/2) + (m_vpSprPill[st][0]->GetZoomedWidth()/2);
pSpr->SetX(fMiddleX);
float fMiddleX = m_vpSprPill[st][0]->GetX() + ( fMiddleWidth/2 ) + ( m_vpSprPill[st][0]->GetZoomedWidth()/2 );
pSpr->SetX( fMiddleX );
}
else if(i!=0) // last pill
{
float fEndX = m_vpSprPill[st][1]->GetX() + (m_vpSprPill[st][1]->GetZoomedWidth()/2) + (pSpr->GetZoomedWidth()/2);
pSpr->SetX(fEndX);
float fEndX = m_vpSprPill[st][1]->GetX() + ( m_vpSprPill[st][1]->GetZoomedWidth()/2 ) + ( pSpr->GetZoomedWidth()/2 );
pSpr->SetX( fEndX );
}
}
// Optimization: Don't draw pills that are covered up