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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-24 02:49:30 +00:00
parent 01d7bab936
commit a511451e4b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LyricDisplay.cpp
+1 -2
View File
@@ -94,8 +94,7 @@ void LyricDisplay::Update( float fDeltaTime )
* "Diffuse=1,1,1,0;linear,.2;Diffuse=1,1,1,1;linear,.2;LyricDiffuse" * "Diffuse=1,1,1,0;linear,.2;Diffuse=1,1,1,1;linear,.2;LyricDiffuse"
*/ */
float fZoom = 1.0f; const float fZoom = min( 1.0f, float(SCREEN_WIDTH)/(m_textLyrics[i].GetZoomedWidth()+1) );
fZoom = min(fZoom, float(SCREEN_WIDTH)/(m_textLyrics[i].GetWidestLineWidthInSourcePixels()+1) );
m_textLyrics[i].StopTweening(); m_textLyrics[i].StopTweening();
m_textLyrics[i].SetZoomX(fZoom); m_textLyrics[i].SetZoomX(fZoom);
stepmania/src/ScreenSelectDifficultyEX.cpp
+2 -2
View File
@@ -269,7 +269,7 @@ void ScreenSelectDifficultyEX::SetAllPlayersSelection( int iChoice, bool bSwitch
m_sprPicture[p].Load( THEME->GetPathToG(sPictureFile) ); m_sprPicture[p].Load( THEME->GetPathToG(sPictureFile) );
int iDiffIndex = GetSelectionIndex((PlayerNumber)p); int iDiffIndex = GetSelectionIndex((PlayerNumber)p);
m_sprHighlight[p].SetBarWidth( int(20 + m_sprDifficulty[iDiffIndex].GetZoomedWidth() + (m_textDifficultyText[iDiffIndex].GetWidestLineWidthInSourcePixels() / 2)) ); m_sprHighlight[p].SetBarWidth( int(20 + m_sprDifficulty[iDiffIndex].GetZoomedWidth() + (m_textDifficultyText[iDiffIndex].GetZoomedWidth() / 2)) );
m_sprHighlight[p].SetXY( DIFFICULTYSPRITE_X(m_iChoice[p]) + 35, DIFFICULTYSPRITE_Y(m_iChoice[p]) ); m_sprHighlight[p].SetXY( DIFFICULTYSPRITE_X(m_iChoice[p]) + 35, DIFFICULTYSPRITE_Y(m_iChoice[p]) );
} }
@@ -311,7 +311,7 @@ void ScreenSelectDifficultyEX::Change( PlayerNumber pn, int iNewChoice )
m_sprPicture[p].Load( THEME->GetPathToG(sPictureFile) ); m_sprPicture[p].Load( THEME->GetPathToG(sPictureFile) );
int iDiffIndex = GetSelectionIndex((PlayerNumber)p); int iDiffIndex = GetSelectionIndex((PlayerNumber)p);
m_sprHighlight[p].SetBarWidth( int( 20 + m_sprDifficulty[iDiffIndex].GetZoomedWidth() + (m_textDifficultyText[iDiffIndex].GetWidestLineWidthInSourcePixels() /2 )) ); m_sprHighlight[p].SetBarWidth( int( 20 + m_sprDifficulty[iDiffIndex].GetZoomedWidth() + (m_textDifficultyText[iDiffIndex].GetZoomedWidth() /2 )) );
m_sprHighlight[p].SetXY( DIFFICULTYSPRITE_X(m_iChoice[p]) + 30, DIFFICULTYSPRITE_Y(m_iChoice[p]) ); m_sprHighlight[p].SetXY( DIFFICULTYSPRITE_X(m_iChoice[p]) + 30, DIFFICULTYSPRITE_Y(m_iChoice[p]) );
} }