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

added GetHasteRate method, made GiveUpSeconds a metric

Browse Source 
without haste rate, it's impossible to display an accurate BPM. Give up
time should be controllable.
This commit is contained in:
sigatrev
2014-04-15 12:27:54 -05:00
parent f1adf16dc5
commit 25ddd69208
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+1
View File
@@ -3313,6 +3313,7 @@ PlayerType="Player"
PlayerInitCommand=y,SCREEN_CENTER_Y;zoom,(THEME:GetMetric("Common","ScreenHeight")/480) PlayerInitCommand=y,SCREEN_CENTER_Y;zoom,(THEME:GetMetric("Common","ScreenHeight")/480)
StartGivesUp=true StartGivesUp=true
BackGivesUp=false BackGivesUp=false
GiveUpSeconds=2.5
# rage # rage
AllowCenter1Player=true AllowCenter1Player=true
# #
src/ScreenGameplay.cpp
+4 -1
View File
@@ -335,6 +335,7 @@ void ScreenGameplay::Init()
GIVE_UP_START_TEXT.Load( m_sName, "GiveUpStartText" ); GIVE_UP_START_TEXT.Load( m_sName, "GiveUpStartText" );
GIVE_UP_BACK_TEXT.Load( m_sName, "GiveUpBackText" ); GIVE_UP_BACK_TEXT.Load( m_sName, "GiveUpBackText" );
GIVE_UP_ABORTED_TEXT.Load( m_sName, "GiveUpAbortedText" ); GIVE_UP_ABORTED_TEXT.Load( m_sName, "GiveUpAbortedText" );
GIVE_UP_SECONDS.Load( m_sName, "GiveUpSeconds" );
MUSIC_FADE_OUT_SECONDS.Load( m_sName, "MusicFadeOutSeconds" ); MUSIC_FADE_OUT_SECONDS.Load( m_sName, "MusicFadeOutSeconds" );
OUT_TRANSITION_LENGTH.Load( m_sName, "OutTransitionLength" ); OUT_TRANSITION_LENGTH.Load( m_sName, "OutTransitionLength" );
COURSE_TRANSITION_LENGTH.Load( m_sName, "CourseTransitionLength" ); COURSE_TRANSITION_LENGTH.Load( m_sName, "CourseTransitionLength" );
@@ -1805,7 +1806,7 @@ void ScreenGameplay::Update( float fDeltaTime )
} }
// update give up // update give up
bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f; bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > GIVE_UP_SECONDS;
bool bAllHumanHaveBigMissCombo = true; bool bAllHumanHaveBigMissCombo = true;
@@ -2865,6 +2866,7 @@ public:
} }
static int PauseGame( T* p, lua_State *L ) { p->Pause( BArg(1)); return 0; } static int PauseGame( T* p, lua_State *L ) { p->Pause( BArg(1)); return 0; }
static int IsPaused( T* p, lua_State *L ) { lua_pushboolean( L, p->IsPaused() ); return 1; } static int IsPaused( T* p, lua_State *L ) { lua_pushboolean( L, p->IsPaused() ); return 1; }
static int GetHasteRate( T* p, lua_State *L ) { lua_pushnumber( L, p->GetHasteRate() ); return 1; }
LunaScreenGameplay() LunaScreenGameplay()
{ {
@@ -2876,6 +2878,7 @@ public:
// sm-ssc additions: // sm-ssc additions:
ADD_METHOD( PauseGame ); ADD_METHOD( PauseGame );
ADD_METHOD( IsPaused ); ADD_METHOD( IsPaused );
ADD_METHOD( GetHasteRate );
} }
}; };
src/ScreenGameplay.h
+2 -1
View File
@@ -170,6 +170,7 @@ public:
PlayerInfo *GetDummyPlayerInfo( int iDummyIndex ); PlayerInfo *GetDummyPlayerInfo( int iDummyIndex );
void Pause(bool bPause) { PauseGame(bPause); } void Pause(bool bPause) { PauseGame(bPause); }
bool IsPaused() const { return m_bPaused; } bool IsPaused() const { return m_bPaused; }
float GetHasteRate();
protected: protected:
virtual void UpdateStageStats( MultiPlayer /* mp */ ) {}; // overridden for multiplayer virtual void UpdateStageStats( MultiPlayer /* mp */ ) {}; // overridden for multiplayer
@@ -182,6 +183,7 @@ protected:
LocalizedString GIVE_UP_START_TEXT; LocalizedString GIVE_UP_START_TEXT;
LocalizedString GIVE_UP_BACK_TEXT; LocalizedString GIVE_UP_BACK_TEXT;
LocalizedString GIVE_UP_ABORTED_TEXT; LocalizedString GIVE_UP_ABORTED_TEXT;
ThemeMetric<float> GIVE_UP_SECONDS;
ThemeMetric<float> MUSIC_FADE_OUT_SECONDS; ThemeMetric<float> MUSIC_FADE_OUT_SECONDS;
ThemeMetric<float> OUT_TRANSITION_LENGTH; ThemeMetric<float> OUT_TRANSITION_LENGTH;
ThemeMetric<float> COURSE_TRANSITION_LENGTH; ThemeMetric<float> COURSE_TRANSITION_LENGTH;
@@ -212,7 +214,6 @@ protected:
void UpdateLights(); void UpdateLights();
void SendCrossedMessages(); void SendCrossedMessages();
void BeginBackingOutFromGameplay(); void BeginBackingOutFromGameplay();
float GetHasteRate();
void PlayTicks(); void PlayTicks();
void UpdateSongPosition( float fDeltaTime ); void UpdateSongPosition( float fDeltaTime );