Fix LifeMeterPills not being full on non-normal drain
Propegate PlayerOptions down to LifeMeterPills in a way more consistant with the rest of the project-- using extra variables and copy constructors, but gaining a SetPlayerOptions() method. Undo silly title screen debug change.
This commit is contained in:
@@ -28,9 +28,7 @@ const float SCORE_Y = SCREEN_HEIGHT - 40;
|
|||||||
const float HOLD_ARROW_NG_TIME = 0.27f;
|
const float HOLD_ARROW_NG_TIME = 0.27f;
|
||||||
|
|
||||||
|
|
||||||
Player::Player() :
|
Player::Player()
|
||||||
m_PlayerOptions(),
|
|
||||||
m_LifeMeter(m_PlayerOptions)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
m_fSongBeat = 0;
|
m_fSongBeat = 0;
|
||||||
@@ -104,7 +102,8 @@ void Player::Load( const StyleDef& StyleDef, PlayerNumber player_no, const Patte
|
|||||||
m_GrayArrows.SetY( po.m_bReverseScroll ? SCREEN_HEIGHT - ARROWS_Y : ARROWS_Y );
|
m_GrayArrows.SetY( po.m_bReverseScroll ? SCREEN_HEIGHT - ARROWS_Y : ARROWS_Y );
|
||||||
m_GhostArrows.SetY( po.m_bReverseScroll ? SCREEN_HEIGHT - ARROWS_Y : ARROWS_Y );
|
m_GhostArrows.SetY( po.m_bReverseScroll ? SCREEN_HEIGHT - ARROWS_Y : ARROWS_Y );
|
||||||
|
|
||||||
|
// Load options into Life Meter
|
||||||
|
m_LifeMeter.SetPlayerOptions(po);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Player::Update( float fDeltaTime, float fSongBeat, float fMaxBeatDifference )
|
void Player::Update( float fDeltaTime, float fSongBeat, float fMaxBeatDifference )
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
#include "GhostArrow.h"
|
#include "GhostArrow.h"
|
||||||
#include "GhostArrowBright.h"
|
#include "GhostArrowBright.h"
|
||||||
#include "HoldGhostArrow.h"
|
#include "HoldGhostArrow.h"
|
||||||
#include "Player.h"
|
|
||||||
#include "ActorFrame.h"
|
#include "ActorFrame.h"
|
||||||
#include "RandomSample.h"
|
#include "RandomSample.h"
|
||||||
#include "ScoreDisplayRollingWithFrame.h"
|
#include "ScoreDisplayRollingWithFrame.h"
|
||||||
|
|||||||
+11078
-3891
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user