Moved LifeType, DrainType, and BatteryLives from Song Options to Player Options. Added ScreenGameplay:FailFadeRemovePlayer lua function.

2014-08-06 23:26:05 -06:00
parent 6aad3c8f75
commit 7e73892e6e
19 changed files with 445 additions and 397 deletions
@@ -172,6 +172,9 @@ public:
 	bool IsPaused() const { return m_bPaused; }
 	float GetHasteRate();

+	void FailFadeRemovePlayer(PlayerInfo* pi);
+	void FailFadeRemovePlayer(PlayerNumber pn);
+
 	vector<float> m_HasteTurningPoints; // Values at which the meaning of GAMESTATE->m_fHasteRate changes.
 	vector<float> m_HasteAddAmounts; // Amounts that are added to speed depending on what turning point has been passed.
 	float m_fHasteTimeBetweenUpdates; // Seconds between haste updates.