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

clean up random background names

Browse Source
This commit is contained in:
Glenn Maynard
2003-05-28 03:35:08 +00:00
parent 57cf60a79f
commit a5d570067e
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Background.cpp
+5 -11
View File
@@ -36,14 +36,8 @@ const float FADE_SECONDS = 1.0f;
const CString STATIC_BACKGROUND = "static background"; const CString STATIC_BACKGROUND = "static background";
const int MAX_RANDOM_BACKGROUNDS = 4; const int MAX_RANDOM_BACKGROUNDS = 4;
const CString RANDOM_BACKGROUND[MAX_RANDOM_BACKGROUNDS] =
{
"__random1",
"__random2",
"__random3",
"__random4",
};
CString RandomBackground(int num) { return ssprintf("__random%i", num); }
Background::Background() Background::Background()
{ {
@@ -242,7 +236,7 @@ void Background::LoadFromSong( Song* pSong )
{ {
for( int i=0; i<MAX_RANDOM_BACKGROUNDS; i++ ) for( int i=0; i<MAX_RANDOM_BACKGROUNDS; i++ )
{ {
CString sBGName = RANDOM_BACKGROUND[ i ]; CString sBGName = RandomBackground(i);
BGAnimation *pTempBGA = CreateRandomBGA(); BGAnimation *pTempBGA = CreateRandomBGA();
if( pTempBGA ) if( pTempBGA )
{ {
@@ -273,7 +267,7 @@ void Background::LoadFromSong( Song* pSong )
m_BGAnimations[sBGName] = pTempBGA; m_BGAnimations[sBGName] = pTempBGA;
else // the background was not found. Use a random one instead else // the background was not found. Use a random one instead
if( bLoadedAnyRandomBackgrounds ) if( bLoadedAnyRandomBackgrounds )
sBGName = RANDOM_BACKGROUND[ rand()%MAX_RANDOM_BACKGROUNDS ]; sBGName = RandomBackground( rand()%MAX_RANDOM_BACKGROUNDS );
else else
sBGName = STATIC_BACKGROUND; sBGName = STATIC_BACKGROUND;
} }
@@ -295,7 +289,7 @@ void Background::LoadFromSong( Song* pSong )
{ {
if( bLoadedAnyRandomBackgrounds ) if( bLoadedAnyRandomBackgrounds )
{ {
CString sBGName = RANDOM_BACKGROUND[ ctr ]; CString sBGName = RandomBackground( ctr );
bool bFade = PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_RANDOMMOVIES || bool bFade = PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_RANDOMMOVIES ||
PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_MOVIEVIS; PREFSMAN->m_BackgroundMode==PrefsManager::BGMODE_MOVIEVIS;
m_aBGChanges.push_back( BackgroundChange(f,sBGName,1.f,bFade) ); m_aBGChanges.push_back( BackgroundChange(f,sBGName,1.f,bFade) );
@@ -316,7 +310,7 @@ void Background::LoadFromSong( Song* pSong )
if( bLoadedAnyRandomBackgrounds ) if( bLoadedAnyRandomBackgrounds )
{ {
CString sBGName = RANDOM_BACKGROUND[ rand()%MAX_RANDOM_BACKGROUNDS ]; CString sBGName = RandomBackground( rand()%MAX_RANDOM_BACKGROUNDS );
m_aBGChanges.push_back( BackgroundChange(bpmseg.m_fStartBeat,sBGName) ); m_aBGChanges.push_back( BackgroundChange(bpmseg.m_fStartBeat,sBGName) );
} }
} }