Para Theme Update, New ScreenGamePlay element: MAXCOMBO (Currently I set the metric so only PARA sees this one) it gets the maxcombo from m_Combo which is inside the class Player which is inside ScreenGameplay. Lots of passing variables around but it works. Perhaps the maxcombo should become global?
This commit is contained in:
@@ -289,6 +289,9 @@ BPMZoom=0.0
|
|||||||
StagenameX=999
|
StagenameX=999
|
||||||
StagenameY=999
|
StagenameY=999
|
||||||
StagenameZoom=0.0
|
StagenameZoom=0.0
|
||||||
|
MAXCOMBOX=999
|
||||||
|
MAXCOMBOY=999
|
||||||
|
MAXCOMBOZoom=0.0
|
||||||
LifeFrameX=320
|
LifeFrameX=320
|
||||||
LifeFrameY=36
|
LifeFrameY=36
|
||||||
LifeFrameExtraY=442
|
LifeFrameExtraY=442
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
#include "ScoreKeeperMAX2.h"
|
#include "ScoreKeeperMAX2.h"
|
||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "RageMath.h"
|
#include "RageMath.h"
|
||||||
|
#include "Combo.h"
|
||||||
|
|
||||||
#define JUDGE_PERFECT_ZOOM_X THEME->GetMetricF("Player","JudgePerfectZoomX")
|
#define JUDGE_PERFECT_ZOOM_X THEME->GetMetricF("Player","JudgePerfectZoomX")
|
||||||
#define JUDGE_PERFECT_ZOOM_Y THEME->GetMetricF("Player","JudgePerfectZoomY")
|
#define JUDGE_PERFECT_ZOOM_Y THEME->GetMetricF("Player","JudgePerfectZoomY")
|
||||||
@@ -100,6 +100,12 @@ Player::Player()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int Player::GetPlayersMaxCombo()
|
||||||
|
{
|
||||||
|
return( m_Combo.GetMaxCombo() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Player::~Player()
|
Player::~Player()
|
||||||
{
|
{
|
||||||
delete m_ScoreKeeper;
|
delete m_ScoreKeeper;
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public:
|
|||||||
void Load( PlayerNumber player_no, NoteData* pNoteData, LifeMeter* pLM, ScoreDisplay* pScore );
|
void Load( PlayerNumber player_no, NoteData* pNoteData, LifeMeter* pLM, ScoreDisplay* pScore );
|
||||||
void CrossedRow( int iNoteRow );
|
void CrossedRow( int iNoteRow );
|
||||||
void Step( int col );
|
void Step( int col );
|
||||||
|
int GetPlayersMaxCombo();
|
||||||
|
|
||||||
void FadeToFail();
|
void FadeToFail();
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,9 @@
|
|||||||
// Defines
|
// Defines
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#define MAXCOMBO_X THEME->GetMetricF("ScreenGameplay","MAXCOMBOX")
|
||||||
|
#define MAXCOMBO_Y THEME->GetMetricF("ScreenGameplay","MAXCOMBOY")
|
||||||
|
#define MAXCOMBO_ZOOM THEME->GetMetricF("ScreenGameplay","MAXCOMBOZoom")
|
||||||
#define BPM_X THEME->GetMetricF("ScreenGameplay","BPMX")
|
#define BPM_X THEME->GetMetricF("ScreenGameplay","BPMX")
|
||||||
#define BPM_Y THEME->GetMetricF("ScreenGameplay","BPMY")
|
#define BPM_Y THEME->GetMetricF("ScreenGameplay","BPMY")
|
||||||
#define BPM_ZOOM THEME->GetMetricF("ScreenGameplay","BPMZoom")
|
#define BPM_ZOOM THEME->GetMetricF("ScreenGameplay","BPMZoom")
|
||||||
@@ -282,6 +285,12 @@ ScreenGameplay::ScreenGameplay()
|
|||||||
m_StageName.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
|
m_StageName.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
|
||||||
this->AddChild( &m_StageName );
|
this->AddChild( &m_StageName );
|
||||||
|
|
||||||
|
m_MaxCombo.LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay score numbers") );
|
||||||
|
m_MaxCombo.SetXY( MAXCOMBO_X, MAXCOMBO_Y );
|
||||||
|
m_MaxCombo.SetZoom( MAXCOMBO_ZOOM );
|
||||||
|
m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */
|
||||||
|
this->AddChild( &m_MaxCombo );
|
||||||
|
|
||||||
for( p=0; p<NUM_PLAYERS; p++ )
|
for( p=0; p<NUM_PLAYERS; p++ )
|
||||||
{
|
{
|
||||||
if( !GAMESTATE->IsPlayerEnabled(PlayerNumber(p)) )
|
if( !GAMESTATE->IsPlayerEnabled(PlayerNumber(p)) )
|
||||||
@@ -703,6 +712,7 @@ void ScreenGameplay::Update( float fDeltaTime )
|
|||||||
GAMESTATE->m_fSongBeat = fSongBeat;
|
GAMESTATE->m_fSongBeat = fSongBeat;
|
||||||
GAMESTATE->m_fCurBPS = fBPS;
|
GAMESTATE->m_fCurBPS = fBPS;
|
||||||
GAMESTATE->m_bFreeze = bFreeze;
|
GAMESTATE->m_bFreeze = bFreeze;
|
||||||
|
m_MaxCombo.SetText( ssprintf("%d", m_Player[GAMESTATE->m_MasterPlayerNumber].GetPlayersMaxCombo()) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */
|
||||||
|
|
||||||
// printf( "m_fSongBeat = %f\n", GAMESTATE->m_fSongBeat );
|
// printf( "m_fSongBeat = %f\n", GAMESTATE->m_fSongBeat );
|
||||||
|
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ private:
|
|||||||
BitmapText m_textDebug;
|
BitmapText m_textDebug;
|
||||||
BitmapText m_textAutoPlay; // shows whether AutoPlay is on.
|
BitmapText m_textAutoPlay; // shows whether AutoPlay is on.
|
||||||
|
|
||||||
|
BitmapText m_MaxCombo;
|
||||||
|
|
||||||
TransitionFadeWipe m_Fade;
|
TransitionFadeWipe m_Fade;
|
||||||
TransitionStarWipe m_StarWipe;
|
TransitionStarWipe m_StarWipe;
|
||||||
|
|||||||
Reference in New Issue
Block a user