From 153bcedd40a27861395303b15c8730dc55df54d2 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 27 Sep 2006 20:03:31 +0000
Subject: [PATCH] simpler Lua boilerplate

---
 stepmania/src/BPMDisplay.cpp         | 11 +++++------
 stepmania/src/Banner.cpp             |  8 +++-----
 stepmania/src/ComboGraph.cpp         |  8 +++-----
 stepmania/src/CourseContentsList.cpp |  8 +++-----
 stepmania/src/CourseEntryDisplay.cpp |  8 +++-----
 stepmania/src/DifficultyIcon.cpp     |  8 +++-----
 stepmania/src/DifficultyList.cpp     |  8 +++-----
 stepmania/src/DifficultyMeter.cpp    |  8 +++-----
 stepmania/src/FadingBanner.cpp       |  8 +++-----
 stepmania/src/GradeDisplay.cpp       | 10 +++++-----
 stepmania/src/GraphDisplay.cpp       |  8 +++-----
 stepmania/src/GrooveRadar.cpp        |  8 +++-----
 stepmania/src/HelpDisplay.cpp        |  9 ++++-----
 stepmania/src/MenuTimer.cpp          | 10 +++++-----
 stepmania/src/Song.cpp               |  8 +++-----
 stepmania/src/Steps.cpp              |  8 +++-----
 stepmania/src/Style.cpp              |  8 +++-----
 stepmania/src/Trail.cpp              |  8 +++-----
 stepmania/src/Workout.cpp            |  8 +++-----
 19 files changed, 64 insertions(+), 96 deletions(-)

diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index 1dada0224d..a781bf698f 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -239,14 +239,13 @@ void BPMDisplay::SetFromGameState()
 class LunaBPMDisplay: public Luna<BPMDisplay>
 {
 public:
-	LunaBPMDisplay() { LUA->Register( Register ); }
-
 	static int SetFromGameState( T* p, lua_State *L ) { p->SetFromGameState(); return 0; }
-	static void Register(lua_State *L) 
-	{
-		ADD_METHOD( SetFromGameState );
 
-		Luna<T>::Register( L );
+	LunaBPMDisplay()
+	{
+		LUA->Register( Register );
+
+		ADD_METHOD( SetFromGameState );
 	}
 };
 
diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp
index 524fe80eee..8b43e3c6cf 100644
--- a/stepmania/src/Banner.cpp
+++ b/stepmania/src/Banner.cpp
@@ -191,8 +191,6 @@ void Banner::LoadRandom()
 class LunaBanner: public Luna<Banner>
 {
 public:
-	LunaBanner() { LUA->Register( Register ); }
-
 	static int scaletoclipped( T* p, lua_State *L )			{ p->ScaleToClipped(FArg(1),FArg(2)); return 0; }
 	static int ScaleToClipped( T* p, lua_State *L )			{ p->ScaleToClipped(FArg(1),FArg(2)); return 0; }
 	static int LoadFromSong( T* p, lua_State *L )
@@ -232,8 +230,10 @@ public:
 		return 0;
 	}
 
-	static void Register(lua_State *L) 
+	LunaBanner()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( scaletoclipped );
 		ADD_METHOD( ScaleToClipped );
 		ADD_METHOD( LoadFromSong );
@@ -242,8 +242,6 @@ public:
 		ADD_METHOD( LoadCardFromCharacter );
 		ADD_METHOD( LoadBannerFromUnlockEntry );
 		ADD_METHOD( LoadBackgroundFromUnlockEntry );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp
index 6140a08812..a8ae2b0a5e 100644
--- a/stepmania/src/ComboGraph.cpp
+++ b/stepmania/src/ComboGraph.cpp
@@ -110,8 +110,6 @@ void ComboGraph::Load( const StageStats &s, const PlayerStageStats &pss )
 class LunaComboGraph: public Luna<ComboGraph>
 {
 public:
-	LunaComboGraph() { LUA->Register( Register ); }
-
 	static int LoadFromStats( T* p, lua_State *L )
 	{
 		StageStats *pStageStats = Luna<StageStats>::check( L, 1 );
@@ -120,11 +118,11 @@ public:
 		return 0;
 	}
 
-	static void Register(lua_State *L) 
+	LunaComboGraph()
 	{
-		ADD_METHOD( LoadFromStats );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( LoadFromStats );
 	}
 };
 
diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp
index 0689809f19..2f5447c966 100644
--- a/stepmania/src/CourseContentsList.cpp
+++ b/stepmania/src/CourseContentsList.cpp
@@ -95,15 +95,13 @@ void CourseContentsList::SetFromGameState()
 class LunaCourseContentsList: public Luna<CourseContentsList>
 {
 public:
-	LunaCourseContentsList() { LUA->Register( Register ); }
-
 	static int SetFromGameState( T* p, lua_State *L )			{ p->SetFromGameState(); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaCourseContentsList()
 	{
-		ADD_METHOD( SetFromGameState );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( SetFromGameState );
 	}
 };
 
diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp
index f16394b062..a6d1e59e61 100644
--- a/stepmania/src/CourseEntryDisplay.cpp
+++ b/stepmania/src/CourseEntryDisplay.cpp
@@ -192,15 +192,13 @@ void CourseEntryDisplay::SetFromGameState( int iCourseEntryIndex )
 class LunaCourseEntryDisplay: public Luna<CourseEntryDisplay>
 {
 public:
-	LunaCourseEntryDisplay() { LUA->Register( Register ); }
-
 	static int SetFromGameState( T* p, lua_State *L )	{ p->SetFromGameState(IArg(1)); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaCourseEntryDisplay()
 	{
-		ADD_METHOD( SetFromGameState );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( SetFromGameState );
 	}
 };
 
diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp
index 728b32947d..53d4639c91 100644
--- a/stepmania/src/DifficultyIcon.cpp
+++ b/stepmania/src/DifficultyIcon.cpp
@@ -105,8 +105,6 @@ void DifficultyIcon::SetFromDifficulty( Difficulty dc )
 class LunaDifficultyIcon: public Luna<DifficultyIcon>
 {
 public:
-	LunaDifficultyIcon() { LUA->Register( Register ); }
-
 	static int SetFromSteps( T* p, lua_State *L )
 	{ 
 		if( lua_isnil(L,1) )
@@ -137,15 +135,15 @@ public:
 	static int SetPlayer( T* p, lua_State *L )			{ p->SetPlayer( Enum::Check<PlayerNumber>(L, 1) ); return 0; }
 	static int SetFromDifficulty( T* p, lua_State *L )		{ p->SetFromDifficulty( Enum::Check<Difficulty>(L, 1) ); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaDifficultyIcon()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( Unset );
 		ADD_METHOD( SetPlayer );
 		ADD_METHOD( SetFromSteps );
 		ADD_METHOD( SetFromTrail );
 		ADD_METHOD( SetFromDifficulty );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp
index 3525aab53c..8fbc6ef614 100644
--- a/stepmania/src/DifficultyList.cpp
+++ b/stepmania/src/DifficultyList.cpp
@@ -379,15 +379,13 @@ void DifficultyList::Hide()
 class LunaDifficultyList: public Luna<DifficultyList>
 {
 public:
-	LunaDifficultyList() { LUA->Register( Register ); }
-
 	static int setfromgamestate( T* p, lua_State *L )		{ p->SetFromGameState(); return 0; }
 
-	static void Register(lua_State *L)
+	LunaDifficultyList()
 	{
-		ADD_METHOD( setfromgamestate );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( setfromgamestate );
 	}
 };
 
diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp
index 9acafaf5f9..16cce783f7 100644
--- a/stepmania/src/DifficultyMeter.cpp
+++ b/stepmania/src/DifficultyMeter.cpp
@@ -257,8 +257,6 @@ void DifficultyMeter::SetInternal( int iMeter, Difficulty dc, const RString &sDi
 class LunaDifficultyMeter: public Luna<DifficultyMeter>
 {
 public:
-	LunaDifficultyMeter() { LUA->Register( Register ); }
-
 	static int Load( T* p, lua_State *L )		{ p->Load( SArg(1) ); return 0; }
 	static int SetFromMeterAndDifficulty( T* p, lua_State *L )		{ p->SetFromMeterAndDifficulty( IArg(1), Enum::Check<Difficulty>(L, 2) ); return 0; }
 	static int SetFromSteps( T* p, lua_State *L )
@@ -294,15 +292,15 @@ public:
 		return 0;
 	}
 
-	static void Register(lua_State *L) 
+	LunaDifficultyMeter()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( Load );
 		ADD_METHOD( SetFromMeterAndDifficulty );
 		ADD_METHOD( SetFromSteps );
 		ADD_METHOD( SetFromTrail );
 		ADD_METHOD( SetFromGameState );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp
index b6c298d305..058d5e7e1b 100644
--- a/stepmania/src/FadingBanner.cpp
+++ b/stepmania/src/FadingBanner.cpp
@@ -245,8 +245,6 @@ void FadingBanner::LoadCourseFallback()
 class LunaFadingBanner: public Luna<FadingBanner>
 {
 public:
-	LunaFadingBanner() { LUA->Register( Register ); }
-
 	static int scaletoclipped( T* p, lua_State *L )			{ p->ScaleToClipped(FArg(1),FArg(2)); return 0; }
 	static int ScaleToClipped( T* p, lua_State *L )			{ p->ScaleToClipped(FArg(1),FArg(2)); return 0; }
 	static int LoadFromSong( T* p, lua_State *L )
@@ -274,16 +272,16 @@ public:
 		return 0;
 	}
 
-	static void Register(lua_State *L) 
+	LunaFadingBanner()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( scaletoclipped );
 		ADD_METHOD( ScaleToClipped );
 		ADD_METHOD( LoadFromSong );
 		ADD_METHOD( LoadFromCourse );
 		ADD_METHOD( LoadIconFromCharacter );
 		ADD_METHOD( LoadCardFromCharacter );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp
index 29e6f27d47..2379837f06 100644
--- a/stepmania/src/GradeDisplay.cpp
+++ b/stepmania/src/GradeDisplay.cpp
@@ -179,13 +179,13 @@ void GradeDisplay::SettleQuickly()
 class LunaGradeDisplay: public Luna<GradeDisplay>
 {
 public:
-	LunaGradeDisplay() { LUA->Register( Register ); }
-
 	static int scroll( T* p, lua_State *L ) { p->Scroll(); return 0; }
-	static void Register(lua_State *L) {
-		ADD_METHOD( scroll );
 
-		Luna<T>::Register( L );
+	LunaGradeDisplay()
+	{
+		LUA->Register( Register );
+
+		ADD_METHOD( scroll );
 	}
 };
 
diff --git a/stepmania/src/GraphDisplay.cpp b/stepmania/src/GraphDisplay.cpp
index 32fc645664..d25f031bda 100644
--- a/stepmania/src/GraphDisplay.cpp
+++ b/stepmania/src/GraphDisplay.cpp
@@ -275,8 +275,6 @@ void GraphDisplay::UpdateVerts()
 class LunaGraphDisplay: public Luna<GraphDisplay>
 {
 public:
-	LunaGraphDisplay() { LUA->Register( Register ); }
-
 	static int LoadFromStats( T* p, lua_State *L )
 	{
 		StageStats *pStageStats = Luna<StageStats>::check( L, 1 );
@@ -285,11 +283,11 @@ public:
 		return 0;
 	}
 
-	static void Register(lua_State *L) 
+	LunaGraphDisplay()
 	{
-		ADD_METHOD( LoadFromStats );
+		LUA->Register( Register );
 
-		Luna<T>::Register( L );
+		ADD_METHOD( LoadFromStats );
 	}
 };
 
diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp
index cfb8c0dd71..fefb70a099 100644
--- a/stepmania/src/GrooveRadar.cpp
+++ b/stepmania/src/GrooveRadar.cpp
@@ -223,8 +223,6 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
 class LunaGrooveRadar: public Luna<GrooveRadar>
 {
 public:
-	LunaGrooveRadar() { LUA->Register( Register ); }
-
 	static int SetFromRadarValues( T* p, lua_State *L )
 	{ 
 		PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
@@ -243,14 +241,14 @@ public:
 	static int tweenonscreen( T* p, lua_State *L )		{ p->TweenOnScreen(); return 0; }
 	static int tweenoffscreen( T* p, lua_State *L )		{ p->TweenOffScreen(); return 0; }
 
-	static void Register(lua_State *L) 
+	LunaGrooveRadar()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( SetFromRadarValues );
 		ADD_METHOD( SetEmpty );
 		ADD_METHOD( tweenonscreen );
 		ADD_METHOD( tweenoffscreen );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp
index c771925733..e86e8fa702 100644
--- a/stepmania/src/HelpDisplay.cpp
+++ b/stepmania/src/HelpDisplay.cpp
@@ -64,8 +64,6 @@ void HelpDisplay::Update( float fDeltaTime )
 class LunaHelpDisplay: public Luna<HelpDisplay>
 {
 public:
-	LunaHelpDisplay() { LUA->Register( Register ); }
-
 	static int settips( T* p, lua_State *L )
 	{
 		luaL_checktype( L, 1, LUA_TTABLE );
@@ -104,13 +102,14 @@ public:
 		return 2;
 	}
 	static int setsecsbetweenswitches( T* p, lua_State *L ) { p->SetSecsBetweenSwitches( FArg(1) ); return 0; }
-	static void Register(lua_State *L) 
+
+	LunaHelpDisplay()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( settips );
 		ADD_METHOD( gettips );
 		ADD_METHOD( setsecsbetweenswitches );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp
index ee88187c65..a0ec9c9bd9 100644
--- a/stepmania/src/MenuTimer.cpp
+++ b/stepmania/src/MenuTimer.cpp
@@ -184,15 +184,15 @@ void MenuTimer::SetText( float fSeconds )
 class LunaMenuTimer: public Luna<MenuTimer>
 {
 public:
-	LunaMenuTimer() { LUA->Register( Register ); }
-
 	static int setseconds( T* p, lua_State *L )		{ p->SetSeconds(FArg(1)); return 0; }
 	static int pause( T* p, lua_State *L )			{ p->Pause(); return 0; }
-	static void Register(lua_State *L) {
+
+	LunaMenuTimer()
+	{
+		LUA->Register( Register );
+
   		ADD_METHOD( setseconds );
   		ADD_METHOD( pause );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 4809621af8..346440b0b9 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -1232,8 +1232,6 @@ bool Song::IsMarathon() const
 class LunaSong: public Luna<Song>
 {
 public:
-	LunaSong() { LUA->Register( Register ); }
-
 	static int GetDisplayFullTitle( T* p, lua_State *L )	{ lua_pushstring(L, p->GetDisplayFullTitle() ); return 1; }
 	static int GetTranslitFullTitle( T* p, lua_State *L )	{ lua_pushstring(L, p->GetTranslitFullTitle() ); return 1; }
 	static int GetDisplayMainTitle( T* p, lua_State *L )	{ lua_pushstring(L, p->GetDisplayMainTitle() ); return 1; }
@@ -1272,8 +1270,10 @@ public:
 		return 1;
 	}
 
-	static void Register(lua_State *L)
+	LunaSong()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( GetDisplayFullTitle );
 		ADD_METHOD( GetTranslitFullTitle );
 		ADD_METHOD( GetDisplayMainTitle );
@@ -1292,8 +1292,6 @@ public:
 		ADD_METHOD( IsLong );
 		ADD_METHOD( IsMarathon );
 		ADD_METHOD( HasStepsTypeAndDifficulty );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp
index db3e3087a4..6db196907b 100644
--- a/stepmania/src/Steps.cpp
+++ b/stepmania/src/Steps.cpp
@@ -398,8 +398,6 @@ void Steps::SetCachedRadarValues( const RadarValues v[NUM_PLAYERS] )
 class LunaSteps: public Luna<Steps>
 {
 public:
-	LunaSteps() { LUA->Register( Register ); }
-
 	DEFINE_METHOD( GetStepsType,	m_StepsType )
 	DEFINE_METHOD( GetDifficulty,	GetDifficulty() )
 	DEFINE_METHOD( GetDescription,	GetDescription() )
@@ -415,8 +413,10 @@ public:
 		return 1;
 	}
 
-	static void Register( lua_State *L )
+	LunaSteps()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( GetStepsType );
 		ADD_METHOD( GetDifficulty );
 		ADD_METHOD( GetDescription );
@@ -424,8 +424,6 @@ public:
 		ADD_METHOD( GetFilename );
 		ADD_METHOD( GetRadarValues );
 		ADD_METHOD( IsAutogen );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp
index e60574522b..351151dd54 100644
--- a/stepmania/src/Style.cpp
+++ b/stepmania/src/Style.cpp
@@ -101,17 +101,15 @@ void Style::GetMinAndMaxColX( PlayerNumber pn, float& fMixXOut, float& fMaxXOut
 class LunaStyle: public Luna<Style>
 {
 public:
-	LunaStyle() { LUA->Register( Register ); }
-
 	DEFINE_METHOD( GetStyleType,		m_StyleType )
 	DEFINE_METHOD( GetStepsType,		m_StepsType )
 
-	static void Register(lua_State *L)
+	LunaStyle()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( GetStyleType );
 		ADD_METHOD( GetStepsType );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp
index 6e82180cac..32f7e31d8e 100644
--- a/stepmania/src/Trail.cpp
+++ b/stepmania/src/Trail.cpp
@@ -191,8 +191,6 @@ bool Trail::ContainsSong( Song* pSong ) const
 class LunaTrail: public Luna<Trail>
 {
 public:
-	LunaTrail() { LUA->Register( Register ); }
-
 	static int GetDifficulty( T* p, lua_State *L )		{ lua_pushnumber(L, p->m_CourseDifficulty ); return 1; }
 	static int GetCourseDifficulty( T* p, lua_State *L )	{ lua_pushnumber(L, p->m_CourseDifficulty ); return 1; } // deprecated
 	static int GetStepsType( T* p, lua_State *L )	{ lua_pushnumber(L, p->m_StepsType ); return 1; }
@@ -232,15 +230,15 @@ public:
 		return 2;
 	}
 
-	static void Register(lua_State *L)
+	LunaTrail()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( GetDifficulty );
 		ADD_METHOD( GetCourseDifficulty );
 		ADD_METHOD( GetStepsType );
 		ADD_METHOD( GetRadarValues );
 		ADD_METHOD( GetArtists );
-
-		Luna<T>::Register( L );
 	}
 };
 
diff --git a/stepmania/src/Workout.cpp b/stepmania/src/Workout.cpp
index 6e08cd44d6..fc2d17fee1 100644
--- a/stepmania/src/Workout.cpp
+++ b/stepmania/src/Workout.cpp
@@ -224,21 +224,19 @@ bool Workout::SaveToFile( RString sFile )
 class LunaWorkout: public Luna<Workout>
 {
 public:
-	LunaWorkout() { LUA->Register( Register ); }
-
 	static int GetName( T* p, lua_State *L )		{ lua_pushstring(L, p->m_sName ); return 1; }
 	static int GetMinutes( T* p, lua_State *L )		{ lua_pushnumber(L, p->m_iMinutes ); return 1; }
 	static int GetEstimatedNumSongs( T* p, lua_State *L )	{ lua_pushnumber(L, p->GetEstimatedNumSongs() ); return 1; }
 	static int GetWorkoutStepsType( T* p, lua_State *L )	{ lua_pushnumber(L, p->m_WorkoutStepsType ); return 1; }
 
-	static void Register(lua_State *L)
+	LunaWorkout()
 	{
+		LUA->Register( Register );
+
 		ADD_METHOD( GetName );
 		ADD_METHOD( GetMinutes );
 		ADD_METHOD( GetEstimatedNumSongs );
 		ADD_METHOD( GetWorkoutStepsType );
-
-		Luna<T>::Register( L );
 	}
 };