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

fix long/marathon balloons

Browse Source
This commit is contained in:
Chris Danford
2003-04-21 22:26:07 +00:00
parent a70d95db67
commit 7e586c3c8b
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -2
View File
@@ -483,8 +483,8 @@ OptionIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
OptionIconsP2OffCommand=linear,0.5;zoomy,0 OptionIconsP2OffCommand=linear,0.5;zoomy,0
BalloonX=392 BalloonX=392
BalloonY=140 BalloonY=140
BalloonOnCommand=zoomy,0;linear,0.5;zoomy,1 BalloonOnCommand=linear,0.2;zoomy,1;bob;effectmagnitude,0,10,0
BalloonOffCommand=linear,0.5;zoomy,0 BalloonOffCommand=linear,0.2;zoomy,0
OptionsMessageX=320 OptionsMessageX=320
OptionsMessageY=240 OptionsMessageY=240
OptionsMessageOnCommand=zoomy,0;linear,0.25;zoomy,1;sleep,1;linear,0.25;zoomy,0 OptionsMessageOnCommand=zoomy,0;linear,0.25;zoomy,1;sleep,1;linear,0.25;zoomy,0
stepmania/src/Actor.cpp
+6 -3
View File
@@ -479,10 +479,13 @@ void Actor::SetEffectBounce( float fPeriod, RageVector3 vect )
void Actor::SetEffectBob( float fPeriod, RageVector3 vect ) void Actor::SetEffectBob( float fPeriod, RageVector3 vect )
{ {
m_Effect = bob; if( m_Effect!=bob || m_fEffectPeriodSeconds!=fPeriod )
m_fEffectPeriodSeconds = fPeriod; {
m_Effect = bob;
m_fEffectPeriodSeconds = fPeriod;
m_fSecsIntoEffect = 0;
}
m_vEffectMagnitude = vect; m_vEffectMagnitude = vect;
m_fSecsIntoEffect = 0;
} }
void Actor::SetEffectSpin( RageVector3 vect ) void Actor::SetEffectSpin( RageVector3 vect )
stepmania/src/ScreenSelectMusic.cpp
+23 -18
View File
@@ -143,15 +143,10 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic")
m_MusicSortDisplay.Set( GAMESTATE->m_SongSortOrder ); m_MusicSortDisplay.Set( GAMESTATE->m_SongSortOrder );
this->AddChild( &m_MusicSortDisplay ); this->AddChild( &m_MusicSortDisplay );
m_sprMarathonBalloon.SetName( "Balloon" ); m_sprBalloon.SetName( "Balloon" );
m_sprMarathonBalloon.Load( THEME->GetPathToG("ScreenSelectMusic marathon") ); TEXTUREMAN->CacheTexture( THEME->GetPathToG("ScreenSelectMusic balloon long") );
m_sprMarathonBalloon.SetDiffuse( RageColor(1,1,1,0) ); TEXTUREMAN->CacheTexture( THEME->GetPathToG("ScreenSelectMusic balloon marathon") );
this->AddChild( &m_sprMarathonBalloon ); this->AddChild( &m_sprBalloon );
m_sprLongBalloon.SetName( "Balloon" );
m_sprLongBalloon.Load( THEME->GetPathToG("ScreenSelectMusic long") );
m_sprLongBalloon.SetDiffuse( RageColor(1,1,1,0) );
this->AddChild( &m_sprLongBalloon );
m_sprOptionsMessage.SetName( "OptionsMessage" ); m_sprOptionsMessage.SetName( "OptionsMessage" );
m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenSelectMusic options message 1x2") ); m_sprOptionsMessage.Load( THEME->GetPathToG("ScreenSelectMusic options message 1x2") );
@@ -739,11 +734,6 @@ void ScreenSelectMusic::AfterMusicChange()
no_banner_change = true; no_banner_change = true;
} }
m_sprMarathonBalloon.StopTweening();
OFF_COMMAND( m_sprMarathonBalloon );
m_sprLongBalloon.StopTweening();
OFF_COMMAND( m_sprLongBalloon );
switch( m_MusicWheel.GetSelectedType() ) switch( m_MusicWheel.GetSelectedType() )
{ {
case TYPE_SECTION: case TYPE_SECTION:
@@ -756,6 +746,9 @@ void ScreenSelectMusic::AfterMusicChange()
m_Banner.LoadFromGroup( sGroup ); // if this isn't a group, it'll default to the fallback banner m_Banner.LoadFromGroup( sGroup ); // if this isn't a group, it'll default to the fallback banner
m_BPMDisplay.NoBPM(); m_BPMDisplay.NoBPM();
m_sprCDTitle.UnloadTexture(); m_sprCDTitle.UnloadTexture();
m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon );
} }
break; break;
case TYPE_SONG: case TYPE_SONG:
@@ -817,13 +810,20 @@ void ScreenSelectMusic::AfterMusicChange()
* like the effect with a lot of delay. */ * like the effect with a lot of delay. */
if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds ) if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds )
{ {
m_sprMarathonBalloon.StopTweening(); m_sprBalloon.StopTweening();
SET_XY_AND_ON_COMMAND( m_sprMarathonBalloon ); m_sprBalloon.Load( THEME->GetPathToG("ScreenSelectMusic balloon marathon") );
SET_XY_AND_ON_COMMAND( m_sprBalloon );
} }
else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds )
{ {
m_sprLongBalloon.StopTweening(); m_sprBalloon.StopTweening();
SET_XY_AND_ON_COMMAND( m_sprLongBalloon ); m_sprBalloon.Load( THEME->GetPathToG("ScreenSelectMusic balloon long") );
SET_XY_AND_ON_COMMAND( m_sprBalloon );
}
else
{
m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon );
} }
} }
break; break;
@@ -839,6 +839,8 @@ void ScreenSelectMusic::AfterMusicChange()
m_fSampleStartSeconds = -1; m_fSampleStartSeconds = -1;
m_fSampleLengthSeconds = -1; m_fSampleLengthSeconds = -1;
m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon );
break; break;
case TYPE_RANDOM: case TYPE_RANDOM:
if(!no_banner_change) if(!no_banner_change)
@@ -851,6 +853,9 @@ void ScreenSelectMusic::AfterMusicChange()
m_sSampleMusicToPlay = THEME->GetPathToS("ScreenSelectMusic random music"); m_sSampleMusicToPlay = THEME->GetPathToS("ScreenSelectMusic random music");
m_fSampleStartSeconds = -1; m_fSampleStartSeconds = -1;
m_fSampleLengthSeconds = -1; m_fSampleLengthSeconds = -1;
m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon );
break; break;
default: default:
ASSERT(0); ASSERT(0);
stepmania/src/ScreenSelectMusic.h
+1 -2
View File
@@ -76,8 +76,7 @@ protected:
Sprite m_sprHighScoreFrame[NUM_PLAYERS]; Sprite m_sprHighScoreFrame[NUM_PLAYERS];
BitmapText m_textHighScore[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS];
MusicWheel m_MusicWheel; MusicWheel m_MusicWheel;
Sprite m_sprMarathonBalloon; Sprite m_sprBalloon;
Sprite m_sprLongBalloon;
bool m_bMadeChoice; bool m_bMadeChoice;
bool m_bGoToOptions; bool m_bGoToOptions;