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:
Jared Roberts
2002-04-03 21:33:51 +00:00
parent be1a1efd18
commit 6b925217b7
3 changed files with 11081 additions and 3896 deletions
+3 -4
View File
@@ -28,9 +28,7 @@ const float SCORE_Y = SCREEN_HEIGHT - 40;
const float HOLD_ARROW_NG_TIME = 0.27f;
Player::Player() :
m_PlayerOptions(),
m_LifeMeter(m_PlayerOptions)
Player::Player()
{
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_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 )
-1
View File
@@ -22,7 +22,6 @@
#include "GhostArrow.h"
#include "GhostArrowBright.h"
#include "HoldGhostArrow.h"
#include "Player.h"
#include "ActorFrame.h"
#include "RandomSample.h"
#include "ScoreDisplayRollingWithFrame.h"
+11078 -3891
View File
File diff suppressed because it is too large Load Diff