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

Ez2SelectMusic now loads in Groups correctly, provided there are at least 5 songs in the group (will fix this bug later)

Browse Source 
Also throws players an error should there be NO songs and then returns them to the title screen.
This commit is contained in:
Andrew Livy
2002-12-29 23:24:53 +00:00
parent 2666b48513
commit a1ab1002e6
4 changed files with 141 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicBannerWheel.cpp
+34 -2
View File
@@ -27,13 +27,45 @@ MusicBannerWheel::MusicBannerWheel()
{
currentPos=0;
scrlistPos=0;
SongsExist=0;
m_ScrollingList.UseSpriteType(BANNERTYPE);
m_ScrollingList.SetXY( 0, 0 );
m_ScrollingList.SetSpacing( BANNERSPACING );
this->AddChild( &m_ScrollingList );
arraySongs = SONGMAN->m_pSongs;
if( 0 == stricmp(GAMESTATE->m_sPreferredGroup, "All Music") )
{
arraySongs = SONGMAN->m_pSongs;
}
else // Get the Group They Want
{
for( unsigned i=0; i< SONGMAN->m_pSongs.size(); i++ )
{
Song* pSong = SONGMAN->m_pSongs[i];
if( GAMESTATE->m_sPreferredGroup != "ALL MUSIC" && pSong->m_sGroupName != GAMESTATE->m_sPreferredGroup )
{
continue;
}
else
{
arraySongs.push_back(pSong);
}
}
}
if( arraySongs.size() > 0)
{
SongsExist=1;
}
else
{
SongsExist=0;
return;
}
// If there is no currently selected song, select one.
if( GAMESTATE->m_pCurSong == NULL )
stepmania/src/MusicBannerWheel.h
+3
View File
@@ -30,6 +30,7 @@ public:
void BannersLeft();
void BannersRight();
Song* GetSelectedSong();
int CheckSongsExist() { return SongsExist; }
private:
void SetNewPos(int NewPos);
void PlayMusicSample();
@@ -41,6 +42,8 @@ private:
ScrollingList m_ScrollingList;
int currentPos;
int scrlistPos;
int SongsExist;
CArray<Song*, Song*> arraySongs;
};
stepmania/src/ScreenEz2SelectMusic.cpp
+97 -22
View File
@@ -43,9 +43,12 @@
#define GUIDE_Y THEME->GetMetricF("ScreenSelectMode","GuideY")
const ScreenMessage SM_GoToPrevScreen = ScreenMessage(SM_User+1);
const ScreenMessage SM_GoToNextScreen = ScreenMessage(SM_User+2);
const ScreenMessage SM_NoSongs = ScreenMessage(SM_User+3);
ScreenEz2SelectMusic::ScreenEz2SelectMusic()
{
i_ErrorDetected=0;
CodeDetector::RefreshCacheItems();
m_Menu.Load(
THEME->GetPathTo("BGAnimations","select music"),
@@ -54,6 +57,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
);
this->AddChild( &m_Menu );
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
m_ChoiceListFrame.Load( THEME->GetPathTo("Graphics","select mode list frame"));
m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
@@ -65,27 +69,41 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
m_MusicBannerWheel.SetX(SCROLLING_LIST_X);
m_MusicBannerWheel.SetY(SCROLLING_LIST_Y);
this->AddChild( &m_MusicBannerWheel );
m_ChoiceListHighlight.Load( THEME->GetPathTo("Graphics","select mode list highlight"));
m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
this->AddChild( &m_ChoiceListHighlight );
for(int p=0; p<NUM_PLAYERS; p++ )
if(m_MusicBannerWheel.CheckSongsExist() != 0)
{
m_FootMeter[p].SetXY( METER_X(p), METER_Y(p) );
m_FootMeter[p].SetShadowLength( 2 );
this->AddChild( &m_FootMeter[p] );
this->AddChild( &m_MusicBannerWheel );
m_iSelection[p] = 0;
m_ChoiceListHighlight.Load( THEME->GetPathTo("Graphics","select mode list highlight"));
m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
this->AddChild( &m_ChoiceListHighlight );
for(int p=0; p<NUM_PLAYERS; p++ )
{
m_FootMeter[p].SetXY( METER_X(p), METER_Y(p) );
m_FootMeter[p].SetShadowLength( 2 );
this->AddChild( &m_FootMeter[p] );
m_iSelection[p] = 0;
}
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","pump songselect difficulty") );
m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
this->AddChild(&m_PumpDifficultyRating);
m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","select music options message") );
m_sprOptionsMessage.StopAnimating();
m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
m_sprOptionsMessage.SetZoom( 1 );
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
this->AddChild( &m_sprOptionsMessage );
m_bGoToOptions = false;
m_bMadeChoice = false;
MusicChanged();
}
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","pump songselect difficulty") );
m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
this->AddChild(&m_PumpDifficultyRating);
MusicChanged();
m_Menu.TweenOnScreenFromMenu( SM_None );
}
@@ -94,6 +112,24 @@ void ScreenEz2SelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy
// if( type != IET_FIRST_PRESS )
// return; // ignore
if(i_ErrorDetected) return; // don't let the user do anything if theres an error
if( type == IET_RELEASE ) return; // don't care
if( m_Menu.IsClosing() ) return; // ignore
if( !GameI.IsValid() ) return; // don't care
if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START )
{
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") );
m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 );
}
if( m_bMadeChoice )
return;
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );
if( CodeDetector::EnteredEasierDifficulty(GameI.controller) )
@@ -119,7 +155,22 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
case SM_GoToNextScreen:
if( m_bGoToOptions )
{
SCREENMAN->SetNewScreen( "ScreenPlayerOptions" );
}
else
{
MUSIC->Stop();
SCREENMAN->SetNewScreen( "ScreenStage" );
}
break;
case SM_NoSongs:
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
}
}
@@ -147,19 +198,43 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
{
if( !m_MusicBannerWheel.GetSelectedSong()->HasMusic() )
{
/* TODO: gray these out.
*
* XXX: also, make sure they're not selected by roulette */
SCREENMAN->Prompt( SM_None, "ERROR:\n \nThis song does not have a music file\n and cannot be played." );
return;
}
MUSIC->Stop();
SCREENMAN->SetNewScreen( "ScreenStage" );
m_bMadeChoice = true;
// show "hold START for options"
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
m_sprOptionsMessage.BeginTweening( 0.25f ); // fade in
m_sprOptionsMessage.SetTweenZoomY( 1 );
m_sprOptionsMessage.SetTweenDiffuse( RageColor(1,1,1,1) );
m_sprOptionsMessage.BeginTweening( 2.0f ); // sleep
m_sprOptionsMessage.BeginTweening( 0.25f ); // fade out
m_sprOptionsMessage.SetTweenDiffuse( RageColor(1,1,1,0) );
m_sprOptionsMessage.SetTweenZoomY( 0 );
m_soundSelect.Play();
m_Menu.TweenOffScreenToBlack( SM_None, false );
m_Menu.StopTimer();
this->SendScreenMessage( SM_GoToNextScreen, 2.5f );
// SCREENMAN->SetNewScreen( "ScreenStage" );
}
void ScreenEz2SelectMusic::Update( float fDeltaTime )
{
if(m_MusicBannerWheel.CheckSongsExist() == 0 && ! i_ErrorDetected)
{
SCREENMAN->Prompt( SM_NoSongs, "ERROR:\n \nThere are no songs available for play!" );
i_ErrorDetected=1;
this->SendScreenMessage( SM_NoSongs, 5.5f ); // timeout incase the user decides to do nothing :D
}
Screen::Update( fDeltaTime );
}
stepmania/src/ScreenEz2SelectMusic.h
+7
View File
@@ -46,12 +46,19 @@ protected:
Sprite m_ChoiceListFrame;
Sprite m_ChoiceListHighlight;
Sprite m_Guide;
Sprite m_sprOptionsMessage;
BitmapText m_PumpDifficultyRating;
MusicBannerWheel m_MusicBannerWheel;
MenuElements m_Menu;
FootMeter m_FootMeter[NUM_PLAYERS];
CArray<Notes*, Notes*> m_arrayNotes[NUM_PLAYERS];
int m_iSelection[NUM_PLAYERS];
bool m_bGoToOptions;
bool m_bMadeChoice;
int i_ErrorDetected;
RageSoundSample m_soundSelect;
};