allow specifying the player type
This commit is contained in:
@@ -1035,6 +1035,7 @@ StaticBGY=SCREEN_CENTER_Y+0
|
|||||||
StaticBGX=SCREEN_CENTER_X+0
|
StaticBGX=SCREEN_CENTER_X+0
|
||||||
PrevScreen=@SongSelectionScreen()
|
PrevScreen=@SongSelectionScreen()
|
||||||
NextScreen=@GetGameplayNextScreen()
|
NextScreen=@GetGameplayNextScreen()
|
||||||
|
PlayerType=Player
|
||||||
InitialBackgroundBrightness=1
|
InitialBackgroundBrightness=1
|
||||||
BPMDisplayX=-1000
|
BPMDisplayX=-1000
|
||||||
BPMDisplayY=-1000
|
BPMDisplayY=-1000
|
||||||
|
|||||||
@@ -58,8 +58,8 @@
|
|||||||
#define SHOW_SCORE_IN_RAVE THEME->GetMetricB(m_sName,"ShowScoreInRave")
|
#define SHOW_SCORE_IN_RAVE THEME->GetMetricB(m_sName,"ShowScoreInRave")
|
||||||
#define SONG_POSITION_METER_WIDTH THEME->GetMetricF(m_sName,"SongPositionMeterWidth")
|
#define SONG_POSITION_METER_WIDTH THEME->GetMetricF(m_sName,"SongPositionMeterWidth")
|
||||||
#define PLAYER_X( p, styleType ) THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str()))
|
#define PLAYER_X( p, styleType ) THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str()))
|
||||||
static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","InitialBackgroundBrightness");
|
|
||||||
|
|
||||||
|
static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","InitialBackgroundBrightness");
|
||||||
static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments");
|
static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments");
|
||||||
static ThemeMetric<float> TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
|
static ThemeMetric<float> TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
|
||||||
|
|
||||||
@@ -89,6 +89,7 @@ static Preference<float> g_fNetStartOffset( Options, "NetworkStartOffset", -3.0
|
|||||||
REGISTER_SCREEN_CLASS( ScreenGameplay );
|
REGISTER_SCREEN_CLASS( ScreenGameplay );
|
||||||
ScreenGameplay::ScreenGameplay( CString sName ) : Screen(sName)
|
ScreenGameplay::ScreenGameplay( CString sName ) : Screen(sName)
|
||||||
{
|
{
|
||||||
|
PLAYER_TYPE.Load( sName, "PlayerType" );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenGameplay::Init()
|
void ScreenGameplay::Init()
|
||||||
@@ -823,7 +824,7 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
|
|||||||
NoteData nd = ndTransformed;
|
NoteData nd = ndTransformed;
|
||||||
NoteDataUtil::RemoveAllTapsOfType( nd, TapNote::autoKeysound );
|
NoteDataUtil::RemoveAllTapsOfType( nd, TapNote::autoKeysound );
|
||||||
m_Player[p].Init(
|
m_Player[p].Init(
|
||||||
"Player",
|
PLAYER_TYPE,
|
||||||
GAMESTATE->m_pPlayerState[p],
|
GAMESTATE->m_pPlayerState[p],
|
||||||
&STATSMAN->m_CurStageStats.m_player[p],
|
&STATSMAN->m_CurStageStats.m_player[p],
|
||||||
m_pLifeMeter[p],
|
m_pLifeMeter[p],
|
||||||
|
|||||||
@@ -161,6 +161,8 @@ protected:
|
|||||||
BeginnerHelper m_BeginnerHelper;
|
BeginnerHelper m_BeginnerHelper;
|
||||||
|
|
||||||
NoteData m_CabinetLightsNoteData;
|
NoteData m_CabinetLightsNoteData;
|
||||||
|
|
||||||
|
ThemeMetric<CString> PLAYER_TYPE;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user