TotalTime in xml
This commit is contained in:
@@ -491,10 +491,6 @@ ScoreP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;acceler
|
|||||||
ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269
|
ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269
|
||||||
ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58
|
ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58
|
||||||
ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269
|
ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269
|
||||||
TotalTimeX=SCREEN_CENTER_X-156
|
|
||||||
TotalTimeY=SCREEN_CENTER_Y+190
|
|
||||||
TotalTimeOnCommand=shadowlength,0;diffusealpha,0;linear,0.5;diffusealpha,1;
|
|
||||||
TotalTimeOffCommand=linear,0.5;diffusealpha,0;
|
|
||||||
MusicWheelX=SCREEN_CENTER_X+160
|
MusicWheelX=SCREEN_CENTER_X+160
|
||||||
MusicWheelY=SCREEN_CENTER_Y+4
|
MusicWheelY=SCREEN_CENTER_Y+4
|
||||||
MusicWheelOnCommand=
|
MusicWheelOnCommand=
|
||||||
@@ -519,10 +515,6 @@ ExplanationX=SCREEN_CENTER_X-188
|
|||||||
ExplanationY=SCREEN_CENTER_Y-172
|
ExplanationY=SCREEN_CENTER_Y-172
|
||||||
ExplanationOnCommand=addx,-SCREEN_WIDTH;sleep,0.5;bounceend,0.5;addx,SCREEN_WIDTH
|
ExplanationOnCommand=addx,-SCREEN_WIDTH;sleep,0.5;bounceend,0.5;addx,SCREEN_WIDTH
|
||||||
ExplanationOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH
|
ExplanationOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH
|
||||||
TotalTimeX=SCREEN_CENTER_X-128
|
|
||||||
TotalTimeY=SCREEN_CENTER_Y-128
|
|
||||||
TotalTimeOnCommand=shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH
|
|
||||||
TotalTimeOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH
|
|
||||||
Codes=CourseCodeDetector
|
Codes=CourseCodeDetector
|
||||||
DoRouletteOnMenuTimer=0
|
DoRouletteOnMenuTimer=0
|
||||||
ScreenBeginCommand=setupcoursestagemods
|
ScreenBeginCommand=setupcoursestagemods
|
||||||
|
|||||||
@@ -132,11 +132,6 @@ void ScreenSelectMusic::Init()
|
|||||||
COMMAND( m_sprCDTitleBack, "Back" );
|
COMMAND( m_sprCDTitleBack, "Back" );
|
||||||
this->AddChild( &m_sprCDTitleBack );
|
this->AddChild( &m_sprCDTitleBack );
|
||||||
|
|
||||||
m_textTotalTime.SetName( "TotalTime" );
|
|
||||||
m_textTotalTime.LoadFromFont( THEME->GetPathF(m_sName,"total time") );
|
|
||||||
SET_XY( m_textTotalTime );
|
|
||||||
this->AddChild( &m_textTotalTime );
|
|
||||||
|
|
||||||
FOREACH_HumanPlayer( p )
|
FOREACH_HumanPlayer( p )
|
||||||
{
|
{
|
||||||
m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) );
|
m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) );
|
||||||
@@ -941,8 +936,6 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
m_fSampleStartSeconds = 0;
|
m_fSampleStartSeconds = 0;
|
||||||
m_fSampleLengthSeconds = -1;
|
m_fSampleLengthSeconds = -1;
|
||||||
|
|
||||||
m_textTotalTime.SetText( "" );
|
|
||||||
|
|
||||||
switch( m_MusicWheel.GetSelectedType() )
|
switch( m_MusicWheel.GetSelectedType() )
|
||||||
{
|
{
|
||||||
case TYPE_SECTION:
|
case TYPE_SECTION:
|
||||||
@@ -975,8 +968,6 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds;
|
m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds;
|
||||||
m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds;
|
m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds;
|
||||||
|
|
||||||
m_textTotalTime.SetText( SecondsToMMSSMsMs(pSong->m_fMusicLengthSeconds) );
|
|
||||||
|
|
||||||
SongUtil::GetSteps( pSong, m_vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType );
|
SongUtil::GetSteps( pSong, m_vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType );
|
||||||
StepsUtil::RemoveLockedSteps( pSong, m_vpSteps );
|
StepsUtil::RemoveLockedSteps( pSong, m_vpSteps );
|
||||||
StepsUtil::SortNotesArrayByDifficulty( m_vpSteps );
|
StepsUtil::SortNotesArrayByDifficulty( m_vpSteps );
|
||||||
@@ -1003,12 +994,6 @@ void ScreenSelectMusic::AfterMusicChange()
|
|||||||
m_fSampleStartSeconds = 0;
|
m_fSampleStartSeconds = 0;
|
||||||
m_fSampleLengthSeconds = -1;
|
m_fSampleLengthSeconds = -1;
|
||||||
|
|
||||||
float fTotalSeconds;
|
|
||||||
if( pCourse->GetTotalSeconds(st,fTotalSeconds) )
|
|
||||||
m_textTotalTime.SetText( SecondsToMMSSMsMs(fTotalSeconds) );
|
|
||||||
else
|
|
||||||
m_textTotalTime.SetText( "xx:xx.xx" ); // The numbers format doesn't have a '?'. Is there a better solution?
|
|
||||||
|
|
||||||
g_sBannerPath = pCourse->m_sBannerPath;
|
g_sBannerPath = pCourse->m_sBannerPath;
|
||||||
if( g_sBannerPath.empty() )
|
if( g_sBannerPath.empty() )
|
||||||
m_Banner.LoadFallback();
|
m_Banner.LoadFallback();
|
||||||
|
|||||||
@@ -76,7 +76,6 @@ protected:
|
|||||||
|
|
||||||
FadingBanner m_Banner;
|
FadingBanner m_Banner;
|
||||||
Sprite m_sprCDTitleFront, m_sprCDTitleBack;
|
Sprite m_sprCDTitleFront, m_sprCDTitleBack;
|
||||||
BitmapText m_textTotalTime;
|
|
||||||
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;
|
||||||
|
|||||||
Reference in New Issue
Block a user