From 1bed6d36308406a4f08a4cad040324952a855bf7 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 18 Feb 2011 23:55:41 -0500 Subject: [PATCH] De-Python-ize REGISTER_ACTOR_CLASS(*). --- src/Actor.cpp | 2 +- src/ActorFrame.cpp | 4 ++-- src/ActorFrameTexture.cpp | 2 +- src/ActorMultiTexture.cpp | 2 +- src/ActorProxy.cpp | 2 +- src/ActorScroller.cpp | 4 ++-- src/ActorSound.cpp | 2 +- src/ActorUtil.h | 13 ++++++++++--- src/BGAnimation.cpp | 2 +- src/BPMDisplay.cpp | 4 ++-- src/Banner.cpp | 2 +- src/BitmapText.cpp | 2 +- src/ComboGraph.cpp | 2 +- src/ControllerStateDisplay.cpp | 2 +- src/CourseContentsList.cpp | 2 +- src/DifficultyIcon.cpp | 2 +- src/DifficultyList.cpp | 2 +- src/DynamicActorScroller.cpp | 2 +- src/FadingBanner.cpp | 2 +- src/GradeDisplay.cpp | 2 +- src/GraphDisplay.cpp | 4 ++-- src/GrooveRadar.cpp | 2 +- src/HelpDisplay.cpp | 2 +- src/HoldJudgment.cpp | 2 +- src/MemoryCardDisplay.cpp | 2 +- src/MeterDisplay.cpp | 4 ++-- src/ModIconRow.cpp | 2 +- src/Model.cpp | 2 +- src/PaneDisplay.cpp | 2 +- src/PercentageDisplay.cpp | 2 +- src/Quad.cpp | 2 +- src/RollingNumbers.cpp | 2 +- src/ScoreDisplayAliveTime.cpp | 2 +- src/ScoreDisplayCalories.cpp | 2 +- src/Sprite.cpp | 2 +- src/TextBanner.cpp | 2 +- src/WorkoutGraph.cpp | 2 +- 37 files changed, 51 insertions(+), 44 deletions(-) diff --git a/src/Actor.cpp b/src/Actor.cpp index 973a22f514..153b947950 100644 --- a/src/Actor.cpp +++ b/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; diff --git a/src/ActorFrame.cpp b/src/ActorFrame.cpp index 0f83865b3c..672cac0279 100644 --- a/src/ActorFrame.cpp +++ b/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_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame ) +//REGISTER_ACTOR_CLASS( ActorFrame ); +REGISTER_ACTOR_CLASS_WITH_NAME( ActorFrameAutoDeleteChildren, ActorFrame ); ActorFrame *ActorFrame::Copy() const { return new ActorFrame(*this); } diff --git a/src/ActorFrameTexture.cpp b/src/ActorFrameTexture.cpp index f770dc0b48..f86cfa225d 100644 --- a/src/ActorFrameTexture.cpp +++ b/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() diff --git a/src/ActorMultiTexture.cpp b/src/ActorMultiTexture.cpp index ef93b9b766..1b69a5c0f0 100644 --- a/src/ActorMultiTexture.cpp +++ b/src/ActorMultiTexture.cpp @@ -13,7 +13,7 @@ #include "LuaBinding.h" #include "LuaManager.h" -REGISTER_ACTOR_CLASS( ActorMultiTexture ) +REGISTER_ACTOR_CLASS( ActorMultiTexture ); ActorMultiTexture::ActorMultiTexture() diff --git a/src/ActorProxy.cpp b/src/ActorProxy.cpp index a977a69730..8429ecab96 100644 --- a/src/ActorProxy.cpp +++ b/src/ActorProxy.cpp @@ -2,7 +2,7 @@ #include "ActorProxy.h" #include "ActorUtil.h" -REGISTER_ACTOR_CLASS( ActorProxy ) +REGISTER_ACTOR_CLASS( ActorProxy ); ActorProxy::ActorProxy() { diff --git a/src/ActorScroller.cpp b/src/ActorScroller.cpp index 53a6cd19c3..3d65ad01d2 100644 --- a/src/ActorScroller.cpp +++ b/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_WITH_NAME( ActorScrollerAutoDeleteChildren, ActorScroller ) +//REGISTER_ACTOR_CLASS( ActorScroller ); +REGISTER_ACTOR_CLASS_WITH_NAME( ActorScrollerAutoDeleteChildren, ActorScroller ); ActorScroller *ActorScroller::Copy() const { return new ActorScroller(*this); } diff --git a/src/ActorSound.cpp b/src/ActorSound.cpp index c750739353..b70fe7fce6 100644 --- a/src/ActorSound.cpp +++ b/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 ) { diff --git a/src/ActorUtil.h b/src/ActorUtil.h index f8c2b56b41..3d199bf1c9 100644 --- a/src/ActorUtil.h +++ b/src/ActorUtil.h @@ -13,14 +13,21 @@ typedef Actor* (*CreateActorFn)(); template 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); } \ }; \ - 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 diff --git a/src/BGAnimation.cpp b/src/BGAnimation.cpp index cac4f31866..dd93e73a8a 100644 --- a/src/BGAnimation.cpp +++ b/src/BGAnimation.cpp @@ -7,7 +7,7 @@ #include "Foreach.h" #include "LuaManager.h" -REGISTER_ACTOR_CLASS(BGAnimation) +REGISTER_ACTOR_CLASS(BGAnimation); BGAnimation::BGAnimation() { diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp index b079cf9f93..19a28a077f 100644 --- a/src/BPMDisplay.cpp +++ b/src/BPMDisplay.cpp @@ -12,7 +12,7 @@ #include -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. */ diff --git a/src/Banner.cpp b/src/Banner.cpp index c3ee65fab7..485722754c 100644 --- a/src/Banner.cpp +++ b/src/Banner.cpp @@ -13,7 +13,7 @@ #include "UnlockManager.h" #include "PrefsManager.h" -REGISTER_ACTOR_CLASS( Banner ) +REGISTER_ACTOR_CLASS( Banner ); ThemeMetric SCROLL_RANDOM ("Banner","ScrollRandom"); ThemeMetric SCROLL_ROULETTE ("Banner","ScrollRoulette"); diff --git a/src/BitmapText.cpp b/src/BitmapText.cpp index 141a661c75..d65911721a 100644 --- a/src/BitmapText.cpp +++ b/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 diff --git a/src/ComboGraph.cpp b/src/ComboGraph.cpp index bc033c296b..21d157b8bd 100644 --- a/src/ComboGraph.cpp +++ b/src/ComboGraph.cpp @@ -8,7 +8,7 @@ const int MinComboSizeToShow = 5; -REGISTER_ACTOR_CLASS( ComboGraph ) +REGISTER_ACTOR_CLASS( ComboGraph ); ComboGraph::ComboGraph() { diff --git a/src/ControllerStateDisplay.cpp b/src/ControllerStateDisplay.cpp index f8a69de06d..12b9cc5471 100644 --- a/src/ControllerStateDisplay.cpp +++ b/src/ControllerStateDisplay.cpp @@ -27,7 +27,7 @@ static const GameButton ControllerStateButtonToGameButton[] = { PUMP_BUTTON_DOWNRIGHT, }; -REGISTER_ACTOR_CLASS( ControllerStateDisplay ) +REGISTER_ACTOR_CLASS( ControllerStateDisplay ); ControllerStateDisplay::ControllerStateDisplay() { diff --git a/src/CourseContentsList.cpp b/src/CourseContentsList.cpp index 98dfa1d61f..14b332e0bc 100644 --- a/src/CourseContentsList.cpp +++ b/src/CourseContentsList.cpp @@ -10,7 +10,7 @@ #include "RageUtil.h" #include "Steps.h" -REGISTER_ACTOR_CLASS( CourseContentsList ) +REGISTER_ACTOR_CLASS( CourseContentsList ); CourseContentsList::~CourseContentsList() { diff --git a/src/DifficultyIcon.cpp b/src/DifficultyIcon.cpp index 8cde519d76..e2f8c450b5 100644 --- a/src/DifficultyIcon.cpp +++ b/src/DifficultyIcon.cpp @@ -12,7 +12,7 @@ #include "XmlFile.h" #include "LuaManager.h" -REGISTER_ACTOR_CLASS(DifficultyIcon) +REGISTER_ACTOR_CLASS(DifficultyIcon); DifficultyIcon::DifficultyIcon() { diff --git a/src/DifficultyList.cpp b/src/DifficultyList.cpp index 668061d8c8..153f1beaa7 100644 --- a/src/DifficultyList.cpp +++ b/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() { diff --git a/src/DynamicActorScroller.cpp b/src/DynamicActorScroller.cpp index e79e2a4392..51f256cc6a 100644 --- a/src/DynamicActorScroller.cpp +++ b/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 diff --git a/src/FadingBanner.cpp b/src/FadingBanner.cpp index b3bbe3e81a..f11baa0421 100644 --- a/src/FadingBanner.cpp +++ b/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- diff --git a/src/GradeDisplay.cpp b/src/GradeDisplay.cpp index 49f7ca60f1..7760ca877b 100644 --- a/src/GradeDisplay.cpp +++ b/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 ) { diff --git a/src/GraphDisplay.cpp b/src/GraphDisplay.cpp index cc5e2c29ab..adf88abfa5 100644 --- a/src/GraphDisplay.cpp +++ b/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 m_Quads; vector m_pCircles; }; -REGISTER_ACTOR_CLASS( GraphLine ) +REGISTER_ACTOR_CLASS( GraphLine ); class GraphBody: public Actor { diff --git a/src/GrooveRadar.cpp b/src/GrooveRadar.cpp index 2544efafad..9f5a3c3fbe 100644 --- a/src/GrooveRadar.cpp +++ b/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)) diff --git a/src/HelpDisplay.cpp b/src/HelpDisplay.cpp index 544d5a691f..bef56bf06e 100644 --- a/src/HelpDisplay.cpp +++ b/src/HelpDisplay.cpp @@ -5,7 +5,7 @@ #include "ThemeManager.h" #include "ActorUtil.h" -REGISTER_ACTOR_CLASS( HelpDisplay ) +REGISTER_ACTOR_CLASS( HelpDisplay ); HelpDisplay::HelpDisplay() { diff --git a/src/HoldJudgment.cpp b/src/HoldJudgment.cpp index d6062f5550..fb9d99a435 100644 --- a/src/HoldJudgment.cpp +++ b/src/HoldJudgment.cpp @@ -7,7 +7,7 @@ #include "ActorUtil.h" #include "XmlFile.h" -REGISTER_ACTOR_CLASS( HoldJudgment ) +REGISTER_ACTOR_CLASS( HoldJudgment ); HoldJudgment::HoldJudgment() { diff --git a/src/MemoryCardDisplay.cpp b/src/MemoryCardDisplay.cpp index 9790355799..0a7ff18ab8 100644 --- a/src/MemoryCardDisplay.cpp +++ b/src/MemoryCardDisplay.cpp @@ -6,7 +6,7 @@ #include "XmlFile.h" #include "ActorUtil.h" -REGISTER_ACTOR_CLASS( MemoryCardDisplay ) +REGISTER_ACTOR_CLASS( MemoryCardDisplay ); MemoryCardDisplay::MemoryCardDisplay() { diff --git a/src/MeterDisplay.cpp b/src/MeterDisplay.cpp index e8b037bcb3..8f04782eef 100644 --- a/src/MeterDisplay.cpp +++ b/src/MeterDisplay.cpp @@ -8,8 +8,8 @@ #include "RageLog.h" #include "LuaManager.h" -REGISTER_ACTOR_CLASS(MeterDisplay) -REGISTER_ACTOR_CLASS(SongMeterDisplay) +REGISTER_ACTOR_CLASS(MeterDisplay); +REGISTER_ACTOR_CLASS(SongMeterDisplay); MeterDisplay::MeterDisplay() { diff --git a/src/ModIconRow.cpp b/src/ModIconRow.cpp index d5cfaa2963..19e0785a10 100644 --- a/src/ModIconRow.cpp +++ b/src/ModIconRow.cpp @@ -10,7 +10,7 @@ #include "LuaManager.h" #include "Foreach.h" -REGISTER_ACTOR_CLASS( ModIconRow ) +REGISTER_ACTOR_CLASS( ModIconRow ); ModIconRow::ModIconRow() { diff --git a/src/Model.cpp b/src/Model.cpp index c73a573975..f61bc45567 100644 --- a/src/Model.cpp +++ b/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"; diff --git a/src/PaneDisplay.cpp b/src/PaneDisplay.cpp index ab7097baf4..88bb957b4e 100644 --- a/src/PaneDisplay.cpp +++ b/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 ) { diff --git a/src/PercentageDisplay.cpp b/src/PercentageDisplay.cpp index 6f22bffd5b..66dcacc8f6 100644 --- a/src/PercentageDisplay.cpp +++ b/src/PercentageDisplay.cpp @@ -12,7 +12,7 @@ #include "Course.h" -REGISTER_ACTOR_CLASS( PercentageDisplay ) +REGISTER_ACTOR_CLASS( PercentageDisplay ); PercentageDisplay::PercentageDisplay() { diff --git a/src/Quad.cpp b/src/Quad.cpp index 6562b2b6cc..3a9d087ede 100644 --- a/src/Quad.cpp +++ b/src/Quad.cpp @@ -3,7 +3,7 @@ #include "ActorUtil.h" #include "RageTextureManager.h" -REGISTER_ACTOR_CLASS( Quad ) +REGISTER_ACTOR_CLASS( Quad ); Quad::Quad() { diff --git a/src/RollingNumbers.cpp b/src/RollingNumbers.cpp index d005b35a72..713a175b5e 100644 --- a/src/RollingNumbers.cpp +++ b/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() { diff --git a/src/ScoreDisplayAliveTime.cpp b/src/ScoreDisplayAliveTime.cpp index 8a6b9e43ba..434d093def 100644 --- a/src/ScoreDisplayAliveTime.cpp +++ b/src/ScoreDisplayAliveTime.cpp @@ -9,7 +9,7 @@ #include "LuaManager.h" #include "RageLog.h" -REGISTER_ACTOR_CLASS( ScoreDisplayAliveTime ) +REGISTER_ACTOR_CLASS( ScoreDisplayAliveTime ); ScoreDisplayAliveTime::ScoreDisplayAliveTime() diff --git a/src/ScoreDisplayCalories.cpp b/src/ScoreDisplayCalories.cpp index 0eb4681379..808447f70a 100644 --- a/src/ScoreDisplayCalories.cpp +++ b/src/ScoreDisplayCalories.cpp @@ -10,7 +10,7 @@ #include "StatsManager.h" #include "LuaManager.h" -REGISTER_ACTOR_CLASS( ScoreDisplayCalories ) +REGISTER_ACTOR_CLASS( ScoreDisplayCalories ); ScoreDisplayCalories::ScoreDisplayCalories() { diff --git a/src/Sprite.cpp b/src/Sprite.cpp index 25a7033a1d..eaee5cbf0c 100644 --- a/src/Sprite.cpp +++ b/src/Sprite.cpp @@ -14,7 +14,7 @@ #include "LuaBinding.h" #include "LuaManager.h" -REGISTER_ACTOR_CLASS( Sprite ) +REGISTER_ACTOR_CLASS( Sprite ); Sprite::Sprite() diff --git a/src/TextBanner.cpp b/src/TextBanner.cpp index 61d6a85181..22c7d38624 100644 --- a/src/TextBanner.cpp +++ b/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 ) { diff --git a/src/WorkoutGraph.cpp b/src/WorkoutGraph.cpp index 1846cc897c..d886c71fa0 100644 --- a/src/WorkoutGraph.cpp +++ b/src/WorkoutGraph.cpp @@ -14,7 +14,7 @@ const int MAX_METERS_TO_SHOW = 50; -REGISTER_ACTOR_CLASS( WorkoutGraph ) +REGISTER_ACTOR_CLASS( WorkoutGraph ); WorkoutGraph::WorkoutGraph() {