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

remove hard limit

Browse Source
This commit is contained in:
Glenn Maynard
2003-05-30 20:39:40 +00:00
parent b631efc312
commit 4efac2b166
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMusicScroll.cpp
+19 -20
View File
@@ -52,17 +52,16 @@ ScreenMusicScroll::ScreenMusicScroll() : Screen("ScreenMusicScroll")
SONGMAN->GetSongs( arraySongs ); SONGMAN->GetSongs( arraySongs );
SortSongPointerArrayByTitle( arraySongs ); SortSongPointerArrayByTitle( arraySongs );
m_iNumLines = 0; for( i=0; i < arraySongs.size(); i++ )
for( i=0; i<min(arraySongs.size(), MAX_MUSIC_LINES); i++ )
{ {
Song* pSong = arraySongs[i]; BitmapText *bt = new BitmapText;
m_textLines[m_iNumLines].LoadFromFont( THEME->GetPathToF("ScreenMusicScroll titles") ); m_textLines.push_back(bt);
m_textLines[m_iNumLines].SetText( pSong->GetFullDisplayTitle(), pSong->GetFullTranslitTitle() );
m_textLines[m_iNumLines].SetDiffuse( SONGMAN->GetSongColor(pSong) );
m_textLines[m_iNumLines].SetZoom( TEXT_ZOOM );
m_iNumLines++; Song* pSong = arraySongs[i];
bt->LoadFromFont( THEME->GetPathToF("ScreenMusicScroll titles") );
bt->SetText( pSong->GetFullDisplayTitle(), pSong->GetFullTranslitTitle() );
bt->SetDiffuse( SONGMAN->GetSongColor(pSong) );
bt->SetZoom( TEXT_ZOOM );
} }
// for( i=0; i<min(NUM_CREDIT_LINES, MAX_CREDIT_LINES); i++ ) // for( i=0; i<min(NUM_CREDIT_LINES, MAX_CREDIT_LINES); i++ )
@@ -74,12 +73,12 @@ ScreenMusicScroll::ScreenMusicScroll() : Screen("ScreenMusicScroll")
// m_iNumLines++; // m_iNumLines++;
// } // }
for( i=0; i<m_iNumLines; i++ ) for( i=0; i<m_textLines.size(); i++ )
{ {
m_textLines[i].SetXY( CENTER_X, SCREEN_BOTTOM + 40 ); m_textLines[i]->SetXY( CENTER_X, SCREEN_BOTTOM + 40 );
m_textLines[i].BeginTweening( SCROLL_DELAY * i ); m_textLines[i]->BeginTweening( SCROLL_DELAY * i );
m_textLines[i].BeginTweening( 2.0f*SCROLL_SPEED ); m_textLines[i]->BeginTweening( 2.0f*SCROLL_SPEED );
m_textLines[i].SetXY( CENTER_X, SCREEN_TOP - 40 ); m_textLines[i]->SetXY( CENTER_X, SCREEN_TOP - 40 );
} }
this->PostScreenMessage( SM_BeginFadingOut, 0.2f * i + 3.0f ); this->PostScreenMessage( SM_BeginFadingOut, 0.2f * i + 3.0f );
@@ -99,8 +98,8 @@ ScreenMusicScroll::ScreenMusicScroll() : Screen("ScreenMusicScroll")
void ScreenMusicScroll::Update( float fDeltaTime ) void ScreenMusicScroll::Update( float fDeltaTime )
{ {
for( unsigned i=0; i<m_iNumLines; i++ ) for( unsigned i=0; i<m_textLines.size(); i++ )
m_textLines[i].Update( fDeltaTime ); m_textLines[i]->Update( fDeltaTime );
m_In.Update( fDeltaTime ); m_In.Update( fDeltaTime );
m_Out.Update( fDeltaTime ); m_Out.Update( fDeltaTime );
@@ -113,11 +112,11 @@ void ScreenMusicScroll::DrawPrimitives()
{ {
Screen::DrawPrimitives(); Screen::DrawPrimitives();
for( unsigned i=0; i<m_iNumLines; i++ ) for( unsigned i=0; i<m_textLines.size(); i++ )
{ {
if( m_textLines[i].GetY() > SCREEN_TOP-20 && if( m_textLines[i]->GetY() > SCREEN_TOP-20 &&
m_textLines[i].GetY() < SCREEN_BOTTOM+20 ) m_textLines[i]->GetY() < SCREEN_BOTTOM+20 )
m_textLines[i].Draw(); m_textLines[i]->Draw();
} }
m_In.Draw(); // render it again so it shows over the text m_In.Draw(); // render it again so it shows over the text
stepmania/src/ScreenMusicScroll.h
+3 -4
View File
@@ -16,9 +16,9 @@
#include "MenuElements.h" #include "MenuElements.h"
const unsigned MAX_MUSIC_LINES = 1200; //const unsigned MAX_MUSIC_LINES = 1200;
//const unsigned MAX_CREDIT_LINES = 100; //const unsigned MAX_CREDIT_LINES = 100;
const unsigned MAX_TOTAL_LINES = MAX_MUSIC_LINES;// + MAX_CREDIT_LINES; //const unsigned MAX_TOTAL_LINES = MAX_MUSIC_LINES;// + MAX_CREDIT_LINES;
class ScreenMusicScroll : public Screen class ScreenMusicScroll : public Screen
@@ -38,8 +38,7 @@ public:
private: private:
BGAnimation m_Background; BGAnimation m_Background;
BitmapText m_textLines[MAX_TOTAL_LINES]; vector<BitmapText *> m_textLines;
unsigned m_iNumLines;
float m_fTimeLeftInScreen; float m_fTimeLeftInScreen;
Transition m_In; Transition m_In;