De-Python-ize REGISTER_ACTOR_CLASS(*).

src/Actor.cpp

@@ -27,7 +27,7 @@ public:
 	HiddenActor() { SetVisible(false); }
 	virtual HiddenActor *Copy() const;
 };
-REGISTER_ACTOR_CLASS_WITH_NAME( HiddenActor, Actor )
+REGISTER_ACTOR_CLASS_WITH_NAME( HiddenActor, Actor );
 
 float Actor::g_fCurrentBGMTime = 0, Actor::g_fCurrentBGMBeat;
 float Actor::g_fCurrentBGMTimeNoOffset = 0, Actor::g_fCurrentBGMBeatNoOffset = 0;

src/ActorFrame.cpp

@@ -16,8 +16,8 @@
  * children.  The name "ActorFrame" is widely used in Lua, so we'll have
  * that string instead create an ActorFrameAutoDeleteChildren object.
  */
-//REGISTER_ACTOR_CLASS( ActorFrame )
+//REGISTER_ACTOR_CLASS( ActorFrame );
-REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame )
+REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame );
 ActorFrame *ActorFrame::Copy() const { return new ActorFrame(*this); }
 
 

src/ActorFrameTexture.cpp

@@ -4,7 +4,7 @@
 #include "RageTextureManager.h"
 #include "ActorUtil.h"
 
-REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameTextureAutoDeleteChildren, ActorFrameTexture )
+REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameTextureAutoDeleteChildren, ActorFrameTexture );
 ActorFrameTexture *ActorFrameTexture::Copy() const { return new ActorFrameTexture(*this); }
 
 ActorFrameTexture::ActorFrameTexture()

src/ActorMultiTexture.cpp

@@ -13,7 +13,7 @@
 #include "LuaBinding.h"
 #include "LuaManager.h"
 
-REGISTER_ACTOR_CLASS( ActorMultiTexture )
+REGISTER_ACTOR_CLASS( ActorMultiTexture );
 
 
 ActorMultiTexture::ActorMultiTexture()

src/ActorProxy.cpp

@@ -2,7 +2,7 @@
 #include "ActorProxy.h"
 #include "ActorUtil.h"
 
-REGISTER_ACTOR_CLASS( ActorProxy )
+REGISTER_ACTOR_CLASS( ActorProxy );
 
 ActorProxy::ActorProxy()
 {

src/ActorScroller.cpp

@@ -12,8 +12,8 @@
  * We don't want classes that derive from ActorFrame to auto delete their 
  * children. The name "ActorFrame" is widely used in Lua, so we'll have
  * that string instead create an ActorFrameAutoDeleteChildren object. */
-//REGISTER_ACTOR_CLASS( ActorScroller )
+//REGISTER_ACTOR_CLASS( ActorScroller );
-REGISTER_ACTOR_CLASS_WITH_NAME( ActorScrollerAutoDeleteChildren, ActorScroller )
+REGISTER_ACTOR_CLASS_WITH_NAME( ActorScrollerAutoDeleteChildren, ActorScroller );
 ActorScroller *ActorScroller::Copy() const { return new ActorScroller(*this); }
 
 

src/ActorSound.cpp

@@ -5,7 +5,7 @@
 #include "XmlFile.h"
 #include "RageUtil.h"
 
-REGISTER_ACTOR_CLASS_WITH_NAME( ActorSound, Sound )
+REGISTER_ACTOR_CLASS_WITH_NAME( ActorSound, Sound );
 
 void ActorSound::Load( const RString &sPath )
 {

src/ActorUtil.h

@@ -13,14 +13,21 @@ typedef Actor* (*CreateActorFn)();
 template<typename T>
 Actor *CreateActor() { return new T; }
 
-// Each Actor class should have a REGISTER_ACTOR_CLASS in its CPP file.
+/**
+ * @brief Register the requested Actor with the specified external name.
+ *
+ * This should be called manually only if needed. */
 #define REGISTER_ACTOR_CLASS_WITH_NAME( className, externalClassName ) \
 	struct Register##className { \
 		Register##className() { ActorUtil::Register(#externalClassName, CreateActor<className>); } \
 	}; \
-	static Register##className register##className; \
+	className *className::Copy() const { return new className(*this); } \
-	className *className::Copy() const { return new className(*this); }
+	static Register##className register##className
 
+/**
+ * @brief Register the requested Actor so that it's more accessible.
+ *
+ * Each Actor class should have a REGISTER_ACTOR_CLASS in its CPP file. */ 
 #define REGISTER_ACTOR_CLASS( className ) REGISTER_ACTOR_CLASS_WITH_NAME( className, className )
 
 enum FileType

src/BGAnimation.cpp

@@ -7,7 +7,7 @@
 #include "Foreach.h"
 #include "LuaManager.h"
 
-REGISTER_ACTOR_CLASS(BGAnimation)
+REGISTER_ACTOR_CLASS(BGAnimation);
 
 BGAnimation::BGAnimation()
 {

src/BPMDisplay.cpp

@@ -12,7 +12,7 @@
 
 #include <limits.h>
 
-REGISTER_ACTOR_CLASS( BPMDisplay )
+REGISTER_ACTOR_CLASS( BPMDisplay );
 
 BPMDisplay::BPMDisplay()
 {
@@ -286,7 +286,7 @@ void SongBPMDisplay::Update( float fDeltaTime )
 	BPMDisplay::Update( fDeltaTime );
 }
 
-REGISTER_ACTOR_CLASS( SongBPMDisplay )
+REGISTER_ACTOR_CLASS( SongBPMDisplay );
 
 #include "LuaBinding.h"
 /** @brief Allow Lua to have access to the BPMDisplay. */

src/Banner.cpp

@@ -13,7 +13,7 @@
 #include "UnlockManager.h"
 #include "PrefsManager.h"
 
-REGISTER_ACTOR_CLASS( Banner )
+REGISTER_ACTOR_CLASS( Banner );
 
 ThemeMetric<bool> SCROLL_RANDOM	("Banner","ScrollRandom");
 ThemeMetric<bool> SCROLL_ROULETTE	("Banner","ScrollRoulette");

src/BitmapText.cpp

@@ -11,7 +11,7 @@
 #include "LuaBinding.h"
 #include "Foreach.h"
 
-REGISTER_ACTOR_CLASS( BitmapText )
+REGISTER_ACTOR_CLASS( BitmapText );
 
 /* XXX: Changing a whole array of diffuse colors every frame (several times) is
  * a waste, when we're usually setting them all to the same value. Rainbow and

src/ComboGraph.cpp

@@ -8,7 +8,7 @@
 
 const int MinComboSizeToShow = 5;
 
-REGISTER_ACTOR_CLASS( ComboGraph )
+REGISTER_ACTOR_CLASS( ComboGraph );
 
 ComboGraph::ComboGraph()
 {

src/ControllerStateDisplay.cpp

@@ -27,7 +27,7 @@ static const GameButton ControllerStateButtonToGameButton[] = {
 	PUMP_BUTTON_DOWNRIGHT,
 };
 
-REGISTER_ACTOR_CLASS( ControllerStateDisplay )
+REGISTER_ACTOR_CLASS( ControllerStateDisplay );
 
 ControllerStateDisplay::ControllerStateDisplay()
 {

src/CourseContentsList.cpp

@@ -10,7 +10,7 @@
 #include "RageUtil.h"
 #include "Steps.h"
 
-REGISTER_ACTOR_CLASS( CourseContentsList )
+REGISTER_ACTOR_CLASS( CourseContentsList );
 
 CourseContentsList::~CourseContentsList()
 {

src/DifficultyIcon.cpp

@@ -12,7 +12,7 @@
 #include "XmlFile.h"
 #include "LuaManager.h"
 
-REGISTER_ACTOR_CLASS(DifficultyIcon)
+REGISTER_ACTOR_CLASS(DifficultyIcon);
 
 DifficultyIcon::DifficultyIcon()
 {

src/DifficultyList.cpp

@@ -24,7 +24,7 @@
 // "magic" 6. -aj
 #define MAX_METERS (NUM_Difficulty * 6) + MAX_EDITS_PER_SONG
 
-REGISTER_ACTOR_CLASS( StepsDisplayList )
+REGISTER_ACTOR_CLASS( StepsDisplayList );
 
 StepsDisplayList::StepsDisplayList()
 {

src/DynamicActorScroller.cpp

@@ -126,7 +126,7 @@ void DynamicActorScroller::ConfigureActor( Actor *pActor, int iItem )
 	LUA->Release(L);
 }
 
-REGISTER_ACTOR_CLASS_WITH_NAME( DynamicActorScrollerAutoDeleteChildren, DynamicActorScroller )
+REGISTER_ACTOR_CLASS_WITH_NAME( DynamicActorScrollerAutoDeleteChildren, DynamicActorScroller );
 
 /*
  * (c) 2005 Glenn Maynard

src/FadingBanner.cpp

@@ -11,7 +11,7 @@
 #include "ThemeMetric.h"
 #include "ActorUtil.h"
 
-REGISTER_ACTOR_CLASS( FadingBanner )
+REGISTER_ACTOR_CLASS( FadingBanner );
 
 /* Allow fading from one banner to another. We can handle two fades at once;
  * this is used to fade from an old banner to a low-quality banner to a high-

src/GradeDisplay.cpp

@@ -6,7 +6,7 @@
 #include "ActorUtil.h"
 #include "ThemeManager.h"
 
-REGISTER_ACTOR_CLASS( GradeDisplay )
+REGISTER_ACTOR_CLASS( GradeDisplay );
 
 void GradeDisplay::Load( RString sMetricsGroup )
 {

src/GraphDisplay.cpp

@@ -13,7 +13,7 @@
 #include "XmlFile.h"
 
 //#define DIVIDE_LINE_WIDTH			THEME->GetMetricI(m_sName,"TexturedBottomHalf")
-REGISTER_ACTOR_CLASS( GraphDisplay )
+REGISTER_ACTOR_CLASS( GraphDisplay );
 
 enum { VALUE_RESOLUTION=100 };
 
@@ -108,7 +108,7 @@ private:
 	vector<RageSpriteVertex> m_Quads;
 	vector<RageSpriteVertex> m_pCircles;
 };
-REGISTER_ACTOR_CLASS( GraphLine )
+REGISTER_ACTOR_CLASS( GraphLine );
 
 class GraphBody: public Actor
 {

src/GrooveRadar.cpp

@@ -11,7 +11,7 @@
 #include "CommonMetrics.h"
 #include "ActorUtil.h"
 
-REGISTER_ACTOR_CLASS(GrooveRadar)
+REGISTER_ACTOR_CLASS(GrooveRadar);
 
 #define		LABEL_OFFSET_X( i )		THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetX",i+1))
 #define 	LABEL_OFFSET_Y( i )		THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetY",i+1))

src/HelpDisplay.cpp

@@ -5,7 +5,7 @@
 #include "ThemeManager.h"
 #include "ActorUtil.h"
 
-REGISTER_ACTOR_CLASS( HelpDisplay )
+REGISTER_ACTOR_CLASS( HelpDisplay );
 
 HelpDisplay::HelpDisplay()
 {

src/HoldJudgment.cpp

@@ -7,7 +7,7 @@
 #include "ActorUtil.h"
 #include "XmlFile.h"
 
-REGISTER_ACTOR_CLASS( HoldJudgment )
+REGISTER_ACTOR_CLASS( HoldJudgment );
 
 HoldJudgment::HoldJudgment()
 {

src/MemoryCardDisplay.cpp

@@ -6,7 +6,7 @@
 #include "XmlFile.h"
 #include "ActorUtil.h"
 
-REGISTER_ACTOR_CLASS( MemoryCardDisplay )
+REGISTER_ACTOR_CLASS( MemoryCardDisplay );
 
 MemoryCardDisplay::MemoryCardDisplay()
 {

src/MeterDisplay.cpp

@@ -8,8 +8,8 @@
 #include "RageLog.h"
 #include "LuaManager.h"
 
-REGISTER_ACTOR_CLASS(MeterDisplay)
+REGISTER_ACTOR_CLASS(MeterDisplay);
-REGISTER_ACTOR_CLASS(SongMeterDisplay)
+REGISTER_ACTOR_CLASS(SongMeterDisplay);
 
 MeterDisplay::MeterDisplay()
 {

src/ModIconRow.cpp

@@ -10,7 +10,7 @@
 #include "LuaManager.h"
 #include "Foreach.h"
 
-REGISTER_ACTOR_CLASS( ModIconRow )
+REGISTER_ACTOR_CLASS( ModIconRow );
 
 ModIconRow::ModIconRow()
 {

src/Model.cpp

@@ -14,7 +14,7 @@
 #include "LuaBinding.h"
 #include "PrefsManager.h"
 
-REGISTER_ACTOR_CLASS( Model )
+REGISTER_ACTOR_CLASS( Model );
 
 static const float FRAMES_PER_SECOND = 30;
 static const RString DEFAULT_ANIMATION_NAME = "default";

src/PaneDisplay.cpp

@@ -55,7 +55,7 @@ static const Content_t g_Contents[NUM_PaneCategory] =
 	{ NEED_NOTES|NEED_PROFILE, "score" }, // ProfileHighScore
 };
 
-REGISTER_ACTOR_CLASS( PaneDisplay )
+REGISTER_ACTOR_CLASS( PaneDisplay );
 
 void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
 {

src/PercentageDisplay.cpp

@@ -12,7 +12,7 @@
 #include "Course.h"
 
 
-REGISTER_ACTOR_CLASS( PercentageDisplay )
+REGISTER_ACTOR_CLASS( PercentageDisplay );
 
 PercentageDisplay::PercentageDisplay()
 {

src/Quad.cpp

@@ -3,7 +3,7 @@
 #include "ActorUtil.h"
 #include "RageTextureManager.h"
 
-REGISTER_ACTOR_CLASS( Quad )
+REGISTER_ACTOR_CLASS( Quad );
 
 Quad::Quad()
 {

src/RollingNumbers.cpp

@@ -5,7 +5,7 @@
 #include "ActorUtil.h"
 #include "LuaManager.h"
 #include "ThemeManager.h"
-REGISTER_ACTOR_CLASS( RollingNumbers )
+REGISTER_ACTOR_CLASS( RollingNumbers );
 
 RollingNumbers::RollingNumbers()
 {

src/ScoreDisplayAliveTime.cpp

@@ -9,7 +9,7 @@
 #include "LuaManager.h"
 #include "RageLog.h"
 
-REGISTER_ACTOR_CLASS( ScoreDisplayAliveTime )
+REGISTER_ACTOR_CLASS( ScoreDisplayAliveTime );
 
 
 ScoreDisplayAliveTime::ScoreDisplayAliveTime()

src/ScoreDisplayCalories.cpp

@@ -10,7 +10,7 @@
 #include "StatsManager.h"
 #include "LuaManager.h"
 
-REGISTER_ACTOR_CLASS( ScoreDisplayCalories )
+REGISTER_ACTOR_CLASS( ScoreDisplayCalories );
 
 ScoreDisplayCalories::ScoreDisplayCalories()
 {

src/Sprite.cpp

@@ -14,7 +14,7 @@
 #include "LuaBinding.h"
 #include "LuaManager.h"
 
-REGISTER_ACTOR_CLASS( Sprite )
+REGISTER_ACTOR_CLASS( Sprite );
 
 
 Sprite::Sprite()

src/TextBanner.cpp

@@ -5,7 +5,7 @@
 #include "ThemeManager.h"
 #include "XmlFile.h"
 
-REGISTER_ACTOR_CLASS( TextBanner )
+REGISTER_ACTOR_CLASS( TextBanner );
 
 void TextBanner::LoadFromNode( const XNode* pNode )
 {

src/WorkoutGraph.cpp

@@ -14,7 +14,7 @@
 
 const int MAX_METERS_TO_SHOW = 50;
 
-REGISTER_ACTOR_CLASS( WorkoutGraph )
+REGISTER_ACTOR_CLASS( WorkoutGraph );
 
 WorkoutGraph::WorkoutGraph()
 {