remove m_Head (incomplete, unused)
This commit is contained in:
@@ -8,9 +8,6 @@
|
|||||||
|
|
||||||
ThemeMetric<float> METER_WIDTH ("CombinedLifeMeterTug","MeterWidth");
|
ThemeMetric<float> METER_WIDTH ("CombinedLifeMeterTug","MeterWidth");
|
||||||
|
|
||||||
const float FACE_X[NUM_PLAYERS] = { -300, +300 };
|
|
||||||
const float FACE_Y[NUM_PLAYERS] = { 0, 0 };
|
|
||||||
|
|
||||||
|
|
||||||
CombinedLifeMeterTug::CombinedLifeMeterTug()
|
CombinedLifeMeterTug::CombinedLifeMeterTug()
|
||||||
{
|
{
|
||||||
@@ -28,18 +25,6 @@ CombinedLifeMeterTug::CombinedLifeMeterTug()
|
|||||||
|
|
||||||
m_sprFrame.Load( THEME->GetPathG("CombinedLifeMeterTug","frame") );
|
m_sprFrame.Load( THEME->GetPathG("CombinedLifeMeterTug","frame") );
|
||||||
this->AddChild( m_sprFrame );
|
this->AddChild( m_sprFrame );
|
||||||
|
|
||||||
|
|
||||||
FOREACH_PlayerNumber( p )
|
|
||||||
{
|
|
||||||
Character* pCharacter = GAMESTATE->m_pCurCharacters[p];
|
|
||||||
ASSERT( pCharacter );
|
|
||||||
|
|
||||||
m_Head[p].SetName( "CharacterHead" );
|
|
||||||
m_Head[p].LoadFromCharacter( pCharacter );
|
|
||||||
m_Head[p].SetXY( FACE_X[p], FACE_Y[p] );
|
|
||||||
this->AddChild( &m_Head[p] );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CombinedLifeMeterTug::Update( float fDelta )
|
void CombinedLifeMeterTug::Update( float fDelta )
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include "CombinedLifeMeter.h"
|
#include "CombinedLifeMeter.h"
|
||||||
#include "Sprite.h"
|
#include "Sprite.h"
|
||||||
#include "MeterDisplay.h"
|
#include "MeterDisplay.h"
|
||||||
#include "CharacterHead.h"
|
|
||||||
|
|
||||||
|
|
||||||
class CombinedLifeMeterTug : public CombinedLifeMeter
|
class CombinedLifeMeterTug : public CombinedLifeMeter
|
||||||
@@ -28,8 +27,6 @@ protected:
|
|||||||
MeterDisplay m_Stream[NUM_PLAYERS];
|
MeterDisplay m_Stream[NUM_PLAYERS];
|
||||||
AutoActor m_sprSeparator;
|
AutoActor m_sprSeparator;
|
||||||
AutoActor m_sprFrame;
|
AutoActor m_sprFrame;
|
||||||
|
|
||||||
CharacterHead m_Head[NUM_PLAYERS];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user