Added pause menu to ScreenGameplay in default theme. Added SetPrevScreenName lua binding to Screen. Added begin_backing_out lua binding to ScreenGameplay.

This commit is contained in:
Kyzentun Keeslala
2016-01-09 11:40:22 -07:00
parent 14caac26ca
commit 0de66f6e1a
11 changed files with 247 additions and 4 deletions
+6 -2
View File
@@ -1959,9 +1959,7 @@ void ScreenGameplay::Update( float fDeltaTime )
pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveBigMissCombo;
pi->GetPlayerStageStats()->m_bDisqualified |= bGiveUpTimerFired; // Don't disqualify if failing for miss combo. The player should still be eligable for a high score on courses.
}
ResetGiveUpTimers(false);
if(GIVING_UP_GOES_TO_PREV_SCREEN && !m_skipped_song)
{
BeginBackingOutFromGameplay();
@@ -3267,6 +3265,11 @@ public:
FLOAT_TABLE_INTERFACE(HasteAddAmounts, HasteAddAmounts, AddAmountsValid);
FLOAT_NO_SPEED_INTERFACE(HasteTimeBetweenUpdates, HasteTimeBetweenUpdates, (v > 0));
FLOAT_NO_SPEED_INTERFACE(HasteLifeSwitchPoint, HasteLifeSwitchPoint, (v >= 0 && v <= 1));
static int begin_backing_out(T* p, lua_State* L)
{
p->BeginBackingOutFromGameplay();
COMMON_RETURN_SELF;
}
static int GetTrueBPS(T* p, lua_State* L)
{
PlayerNumber pn= Enum::Check<PlayerNumber>(L, 1);
@@ -3293,6 +3296,7 @@ public:
ADD_METHOD( HasteAddAmounts );
ADD_METHOD( HasteTimeBetweenUpdates );
ADD_METHOD( HasteLifeSwitchPoint );
ADD_METHOD(begin_backing_out);
ADD_METHOD( GetTrueBPS );
}
};