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

use new musicwheel and fadingbanner code

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-02 03:00:53 +00:00
parent 62a0491977
commit b9c4b14002
5 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectCourse.cpp
+21 -19
View File
@@ -18,7 +18,6 @@
#include "GameManager.h"
#include "RageMusic.h"
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "RageLog.h"
#include "InputMapper.h"
#include "InputQueue.h"
@@ -189,10 +188,25 @@ void ScreenSelectCourse::TweenOffScreen()
}
void ScreenSelectCourse::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
void ScreenSelectCourse::Input( const DeviceInput& DeviceI, InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
LOG->Trace( "ScreenSelectCourse::Input()" );
if( MenuI.button == MENU_BUTTON_RIGHT || MenuI.button == MENU_BUTTON_LEFT )
{
if( !MenuI.IsValid() ) return;
if( !GAMESTATE->IsPlayerEnabled(MenuI.player) ) return;
int dir = 0;
if(INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_RIGHT) ) )
dir++;
if(INPUTMAPPER->IsButtonDown( MenuInput(MenuI.player, MENU_BUTTON_LEFT) ) )
dir--;
m_MusicWheel.Move(dir);
return;
}
if( type == IET_RELEASE ) return; // don't care
if( m_Menu.IsClosing() ) return; // ignore
@@ -252,24 +266,12 @@ void ScreenSelectCourse::HandleScreenMessage( const ScreenMessage SM )
SCREENMAN->SetNewScreen( "ScreenStage" );
break;
case SM_SongChanged:
AfterCourseChange();
break;
}
}
void ScreenSelectCourse::MenuLeft( PlayerNumber pn, const InputEventType type )
{
m_MusicWheel.PrevMusic();
AfterCourseChange();
}
void ScreenSelectCourse::MenuRight( PlayerNumber pn, const InputEventType type )
{
m_MusicWheel.NextMusic();
AfterCourseChange();
}
void ScreenSelectCourse::MenuStart( PlayerNumber pn )
{
// this needs to check whether valid Notes are selected!
@@ -335,13 +337,13 @@ void ScreenSelectCourse::AfterCourseChange()
fTotalSeconds += pCourse->GetSong(i)->m_fMusicLengthSeconds;
m_textTime.SetText( SecondsToTime(fTotalSeconds) );
m_Banner.SetFromCourse( pCourse );
m_Banner.LoadFromCourse( pCourse );
m_CourseContentsFrame.SetFromCourse( pCourse );
}
break;
case TYPE_SECTION: // if we get here, there are no courses
m_Banner.SetFromGroup( "" );
m_Banner.LoadFromGroup( "" );
break;
default:
ASSERT(0);