From 9efb17eca7b53829fbc48d87032e8f6a3f2e2028 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 21 Apr 2011 01:44:13 -0500
Subject: [PATCH] [LifeMeterBattery] Convert Frame to an AutoActor.

---
 Docs/Changelog_sm-ssc.txt | 1 +
 src/LifeMeterBattery.cpp  | 2 +-
 src/LifeMeterBattery.h    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index 7015eab258..a886d68d52 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -16,6 +16,7 @@ sm-ssc v1.2.5 | 201104??
 20110421
 --------
 * [ScreenSelectMusic] Changed "Percent Frame p1" to "PercentFrame P1" for consistency. [AJ]
+* [LifeMeterBattery] Convert Frame to an AutoActor. [AJ]
 
 20110420
 --------
diff --git a/src/LifeMeterBattery.cpp b/src/LifeMeterBattery.cpp
index 33bba52c85..00fb586848 100644
--- a/src/LifeMeterBattery.cpp
+++ b/src/LifeMeterBattery.cpp
@@ -31,7 +31,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
 	bool bPlayerEnabled = GAMESTATE->IsPlayerEnabled( pPlayerState );
 
 	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.SetName( ssprintf("BatteryP%i",int(pn+1)) );
diff --git a/src/LifeMeterBattery.h b/src/LifeMeterBattery.h
index d1d39473fc..08d72233db 100644
--- a/src/LifeMeterBattery.h
+++ b/src/LifeMeterBattery.h
@@ -7,6 +7,7 @@
 #include "RageSound.h"
 #include "PercentageDisplay.h"
 #include "ThemeMetric.h"
+#include "AutoActor.h"
 
 /** @brief Battery life meter used in Oni mode. */
 class LifeMeterBattery : public LifeMeter
@@ -45,7 +46,7 @@ private:
 	//ThemeMetric<> METRIC_NAME;
 	ThemeMetric<float> BATTERY_BLINK_TIME;
 
-	Sprite		m_sprFrame;
+	AutoActor	m_sprFrame;
 	Sprite		m_sprBattery;
 	BitmapText	m_textNumLives;