actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[LifeMeterBattery] Convert Frame to an AutoActor.

Browse Source
This commit is contained in:
AJ Kelly
2011-04-21 01:44:13 -05:00
parent e24529e3fc
commit 9efb17eca7
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+1
View File
@@ -16,6 +16,7 @@ sm-ssc v1.2.5 | 201104??
20110421 20110421
-------- --------
* [ScreenSelectMusic] Changed "Percent Frame p1" to "PercentFrame P1" for consistency. [AJ] * [ScreenSelectMusic] Changed "Percent Frame p1" to "PercentFrame P1" for consistency. [AJ]
* [LifeMeterBattery] Convert Frame to an AutoActor. [AJ]
20110420 20110420
-------- --------
src/LifeMeterBattery.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
bool bPlayerEnabled = GAMESTATE->IsPlayerEnabled( pPlayerState ); bool bPlayerEnabled = GAMESTATE->IsPlayerEnabled( pPlayerState );
m_sprFrame.Load( THEME->GetPathG(sType,"frame") ); m_sprFrame.Load( THEME->GetPathG(sType,"frame") );
this->AddChild( &m_sprFrame ); this->AddChild( m_sprFrame );
m_sprBattery.Load( THEME->GetPathG(sType,"lives 1x4") ); m_sprBattery.Load( THEME->GetPathG(sType,"lives 1x4") );
m_sprBattery.SetName( ssprintf("BatteryP%i",int(pn+1)) ); m_sprBattery.SetName( ssprintf("BatteryP%i",int(pn+1)) );
src/LifeMeterBattery.h
+2 -1
View File
@@ -7,6 +7,7 @@
#include "RageSound.h" #include "RageSound.h"
#include "PercentageDisplay.h" #include "PercentageDisplay.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "AutoActor.h"
/** @brief Battery life meter used in Oni mode. */ /** @brief Battery life meter used in Oni mode. */
class LifeMeterBattery : public LifeMeter class LifeMeterBattery : public LifeMeter
@@ -45,7 +46,7 @@ private:
//ThemeMetric<> METRIC_NAME; //ThemeMetric<> METRIC_NAME;
ThemeMetric<float> BATTERY_BLINK_TIME; ThemeMetric<float> BATTERY_BLINK_TIME;
Sprite m_sprFrame; AutoActor m_sprFrame;
Sprite m_sprBattery; Sprite m_sprBattery;
BitmapText m_textNumLives; BitmapText m_textNumLives;