From 9d7f8356096e2a23ed5ff0ae779f520340256fdd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 20 Jun 2005 05:02:03 +0000 Subject: [PATCH] no need to template Luna specializations --- stepmania/src/Actor.cpp | 3 +-- stepmania/src/ActorFrame.cpp | 3 +-- stepmania/src/ActorScroller.cpp | 3 +-- stepmania/src/BitmapText.cpp | 3 +-- stepmania/src/Character.cpp | 3 +-- stepmania/src/Course.cpp | 3 +-- stepmania/src/DifficultyMeter.cpp | 3 +-- stepmania/src/FadingBanner.cpp | 3 +-- stepmania/src/GameSoundManager.cpp | 3 +-- stepmania/src/GameState.cpp | 3 +-- stepmania/src/HelpDisplay.cpp | 3 +-- stepmania/src/LuaBinding.h | 12 ++++++++---- stepmania/src/MessageManager.cpp | 3 +-- stepmania/src/Model.cpp | 3 +-- stepmania/src/NoteSkinManager.cpp | 3 +-- stepmania/src/PlayerStageStats.cpp | 3 +-- stepmania/src/PrefsManager.cpp | 3 +-- stepmania/src/Profile.cpp | 3 +-- stepmania/src/ProfileManager.cpp | 3 +-- stepmania/src/RageInput.cpp | 3 +-- stepmania/src/RollingNumbers.cpp | 3 +-- stepmania/src/ScoreDisplayAliveTime.cpp | 3 +-- stepmania/src/ScoreDisplayCalories.cpp | 3 +-- stepmania/src/Song.cpp | 3 +-- stepmania/src/SongManager.cpp | 3 +-- stepmania/src/Sprite.cpp | 3 +-- stepmania/src/StageStats.cpp | 3 +-- stepmania/src/StatsManager.cpp | 3 +-- stepmania/src/Steps.cpp | 3 +-- stepmania/src/ThemeManager.cpp | 3 +-- stepmania/src/Trail.cpp | 3 +-- stepmania/src/UnlockManager.cpp | 3 +-- 32 files changed, 39 insertions(+), 66 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index f553feb798..cd15de169e 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -1087,8 +1087,7 @@ void Actor::SubscribeToMessage( Message message ) // lua start #include "LuaBinding.h" -template -class LunaActor : public Luna +class LunaActor : public Luna { public: LunaActor() { LUA->Register( Register ); } diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp index 02aee967bd..7fadfacf03 100644 --- a/stepmania/src/ActorFrame.cpp +++ b/stepmania/src/ActorFrame.cpp @@ -328,8 +328,7 @@ void ActorFrame::SetDrawByZPosition( bool b ) // lua start #include "LuaBinding.h" -template -class LunaActorFrame : public Luna +class LunaActorFrame : public Luna { public: LunaActorFrame() { LUA->Register( Register ); } diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index e33736e55c..6d3eafc772 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -281,8 +281,7 @@ void ActorScroller::DrawPrimitives() // lua start #include "LuaBinding.h" -template -class LunaActorScroller : public Luna +class LunaActorScroller: public Luna { public: LunaActorScroller() { LUA->Register( Register ); } diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 3bc1fb160a..61c6d0ef4b 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -841,8 +841,7 @@ void ColorBitmapText::SetMaxLines( int iNumLines, int iDirection ) // lua start -template -class LunaBitmapText : public Luna +class LunaBitmapText: public Luna { public: LunaBitmapText() { LUA->Register( Register ); } diff --git a/stepmania/src/Character.cpp b/stepmania/src/Character.cpp index ca4c06d04a..b7adb8be64 100644 --- a/stepmania/src/Character.cpp +++ b/stepmania/src/Character.cpp @@ -166,8 +166,7 @@ bool Character::Has2DElems() // lua start #include "LuaBinding.h" -template -class LunaCharacter : public Luna +class LunaCharacter: public Luna { public: LunaCharacter() { LUA->Register( Register ); } diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 8d13197068..9745efa1b8 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -1330,8 +1330,7 @@ void Course::CalculateRadarValues() // lua start #include "LuaBinding.h" -template -class LunaCourse : public Luna +class LunaCourse: public Luna { public: LunaCourse() { LUA->Register( Register ); } diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 00a61ad2db..a69e84adcf 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -255,8 +255,7 @@ void DifficultyMeter::SetInternal( int iMeter, Difficulty dc, const CString &sDi // lua start #include "LuaBinding.h" -template -class LunaDifficultyMeter : public Luna +class LunaDifficultyMeter: public Luna { public: LunaDifficultyMeter() { LUA->Register( Register ); } diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp index 36e136d941..d6c522b3ba 100644 --- a/stepmania/src/FadingBanner.cpp +++ b/stepmania/src/FadingBanner.cpp @@ -211,8 +211,7 @@ void FadingBanner::LoadFallback() // lua start #include "LuaBinding.h" -template -class LunaFadingBanner : public Luna +class LunaFadingBanner: public Luna { public: LunaFadingBanner() { LUA->Register( Register ); } diff --git a/stepmania/src/GameSoundManager.cpp b/stepmania/src/GameSoundManager.cpp index a8cba8d7ea..b8d3856436 100644 --- a/stepmania/src/GameSoundManager.cpp +++ b/stepmania/src/GameSoundManager.cpp @@ -650,8 +650,7 @@ void GameSoundManager::SetPlayerBalance( PlayerNumber pn, RageSoundParams ¶m #include "LuaBinding.h" -template -class LunaGameSoundManager: public Luna +class LunaGameSoundManager: public Luna { public: LunaGameSoundManager() { LUA->Register( Register ); } diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index d19bd84c16..5e0998f786 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1975,8 +1975,7 @@ void GameState::RevertSyncChanges() // lua start #include "LuaBinding.h" -template -class LunaGameState : public Luna +class LunaGameState: public Luna { public: LunaGameState() { LUA->Register( Register ); } diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp index 4c327fe46c..31dabf66e5 100644 --- a/stepmania/src/HelpDisplay.cpp +++ b/stepmania/src/HelpDisplay.cpp @@ -76,8 +76,7 @@ void HelpDisplay::Update( float fDeltaTime ) #include "LuaBinding.h" -template -class LunaHelpDisplay : public Luna +class LunaHelpDisplay: public Luna { public: LunaHelpDisplay() { LUA->Register( Register ); } diff --git a/stepmania/src/LuaBinding.h b/stepmania/src/LuaBinding.h index 0463824a7d..c6ef32e1ea 100644 --- a/stepmania/src/LuaBinding.h +++ b/stepmania/src/LuaBinding.h @@ -17,9 +17,13 @@ struct RegType void CreateGlobalTable( lua_State *L, const CString &szName ); bool CheckType( lua_State *L, int narg, const char *szType ); -template +template class Luna { +protected: + typedef Type T; + +private: typedef struct { T *pT; } userdataType; public: @@ -169,9 +173,9 @@ private: #define LUA_REGISTER_DERIVED_CLASS( T, B ) \ template<> const char *Luna::m_sClassName = #T; \ template<> const char *Luna::m_sBaseClassName = #B; \ - template<> Luna::RegTypeVector* Luna::s_pvMethods = NULL; \ - static Luna##T registera; \ -void T::PushSelf( lua_State *L ) { Luna##T::Push( L, this ); } \ + Luna::RegTypeVector* Luna::s_pvMethods = NULL; \ + static Luna##T registera; \ +void T::PushSelf( lua_State *L ) { Luna##T::Push( L, this ); } \ /* Call PushSelf, so we always call the derived Luna::Push. */ \ namespace LuaHelpers { template<> void Push( T *pObject, lua_State *L ) { pObject->PushSelf( L ); } } diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index 7f643f6994..6864dd39e5 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -111,8 +111,7 @@ void MessageManager::Broadcast( Message m ) const // lua start #include "LuaBinding.h" -template -class LunaMessageManager: public Luna +class LunaMessageManager: public Luna { public: LunaMessageManager() { LUA->Register( Register ); } diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index fd5d01ade7..7968ec6859 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -834,8 +834,7 @@ bool Model::MaterialsNeedNormals() const // lua start #include "LuaBinding.h" -template -class LunaModel : public Luna +class LunaModel: public Luna { public: LunaModel() { LUA->Register( Register ); } diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp index d3e8f18efb..b2f5c64d11 100644 --- a/stepmania/src/NoteSkinManager.cpp +++ b/stepmania/src/NoteSkinManager.cpp @@ -304,8 +304,7 @@ CString NoteSkinManager::GetPathFromDirAndFile( const CString &sDir, const CStri // lua start #include "LuaBinding.h" -template -class LunaNoteSkinManager : public Luna +class LunaNoteSkinManager: public Luna { public: LunaNoteSkinManager() { LUA->Register( Register ); } diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 7b21255b90..7b8bf35ce3 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -451,8 +451,7 @@ LuaFunction( GetGradeFromPercent, PlayerStageStats::GetGradeFromPercent( FArg(1) // lua start #include "LuaBinding.h" -template -class LunaPlayerStageStats : public Luna +class LunaPlayerStageStats: public Luna { public: LunaPlayerStageStats() { LUA->Register( Register ); } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 0802f7053f..fce1285a49 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -425,8 +425,7 @@ CString PrefsManager::GetLightsDriver() { // lua start #include "LuaBinding.h" -template -class LunaPrefsManager : public Luna +class LunaPrefsManager: public Luna { public: LunaPrefsManager() { LUA->Register( Register ); } diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index f25ce8edc1..73f4a3fcf1 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -1830,8 +1830,7 @@ bool Profile::CreateNewProfile( CString sProfileDir, CString sName ) // lua start #include "LuaBinding.h" -template -class LunaProfile : public Luna +class LunaProfile: public Luna { public: LunaProfile() { LUA->Register( Register ); } diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp index 6990db2a81..8e6d783afc 100644 --- a/stepmania/src/ProfileManager.cpp +++ b/stepmania/src/ProfileManager.cpp @@ -623,8 +623,7 @@ bool ProfileManager::IsPersistentProfile( ProfileSlot slot ) const // lua start #include "LuaBinding.h" -template -class LunaProfileManager : public Luna +class LunaProfileManager: public Luna { public: LunaProfileManager() { LUA->Register( Register ); } diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp index 05bdbd9396..4d35f2bfc1 100644 --- a/stepmania/src/RageInput.cpp +++ b/stepmania/src/RageInput.cpp @@ -56,8 +56,7 @@ void RageInput::AddHandler( InputHandler *pHandler ) // lua start #include "LuaBinding.h" -template -class LunaRageInput : public Luna +class LunaRageInput: public Luna { public: LunaRageInput() { LUA->Register( Register ); } diff --git a/stepmania/src/RollingNumbers.cpp b/stepmania/src/RollingNumbers.cpp index cdb2c103b2..8a6a377a3a 100644 --- a/stepmania/src/RollingNumbers.cpp +++ b/stepmania/src/RollingNumbers.cpp @@ -60,8 +60,7 @@ void RollingNumbers::UpdateText() // lua start #include "LuaBinding.h" -template -class LunaRollingNumbers : public Luna +class LunaRollingNumbers: public Luna { public: LunaRollingNumbers() { LUA->Register( Register ); } diff --git a/stepmania/src/ScoreDisplayAliveTime.cpp b/stepmania/src/ScoreDisplayAliveTime.cpp index 06061fd4b5..95d2b7ce84 100644 --- a/stepmania/src/ScoreDisplayAliveTime.cpp +++ b/stepmania/src/ScoreDisplayAliveTime.cpp @@ -61,8 +61,7 @@ void ScoreDisplayAliveTime::UpdateNumber() // lua start #include "LuaBinding.h" -template -class LunaScoreDisplayAliveTime : public Luna +class LunaScoreDisplayAliveTime: public Luna { public: LunaScoreDisplayAliveTime() { LUA->Register( Register ); } diff --git a/stepmania/src/ScoreDisplayCalories.cpp b/stepmania/src/ScoreDisplayCalories.cpp index 4958c060e2..a41aee46b3 100644 --- a/stepmania/src/ScoreDisplayCalories.cpp +++ b/stepmania/src/ScoreDisplayCalories.cpp @@ -70,8 +70,7 @@ void ScoreDisplayCalories::UpdateNumber() // lua start #include "LuaBinding.h" -template -class LunaScoreDisplayCalories : public Luna +class LunaScoreDisplayCalories: public Luna { public: LunaScoreDisplayCalories() { LUA->Register( Register ); } diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 116cdecb3f..da088c3765 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -1512,8 +1512,7 @@ void Song::MakeUniqueEditDescription( StepsType st, CString &sPreferredDescripti // lua start #include "LuaBinding.h" -template -class LunaSong : public Luna +class LunaSong: public Luna { public: LunaSong() { LUA->Register( Register ); } diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 85e4efbf6f..18c71d5a34 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1296,8 +1296,7 @@ int SongManager::GetNumStepsLoadedFromProfile() // lua start #include "LuaBinding.h" -template -class LunaSongManager : public Luna +class LunaSongManager: public Luna { public: LunaSongManager() { LUA->Register( Register ); } diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index e250faee36..8b53b9dfb7 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -925,8 +925,7 @@ void Sprite::SetPlaybackRate( float f ) { GetTexture()->SetPlaybackRate(f); } // lua start #include "LuaBinding.h" -template -class LunaSprite : public Luna +class LunaSprite: public Luna { public: LunaSprite() { LUA->Register( Register ); } diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp index 2381215088..a2f036844c 100644 --- a/stepmania/src/StageStats.cpp +++ b/stepmania/src/StageStats.cpp @@ -105,8 +105,7 @@ float StageStats::GetTotalPossibleStepsSeconds() const // lua start #include "LuaBinding.h" -template -class LunaStageStats : public Luna +class LunaStageStats: public Luna { public: LunaStageStats() { LUA->Register( Register ); } diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index 3a4c69f429..eb9c40a813 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -190,8 +190,7 @@ void StatsManager::CommitStatsToProfiles() // lua start #include "LuaBinding.h" -template -class LunaStatsManager : public Luna +class LunaStatsManager: public Luna { public: LunaStatsManager() { LUA->Register( Register ); } diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp index e9ad4fd31a..35cc20faa9 100644 --- a/stepmania/src/Steps.cpp +++ b/stepmania/src/Steps.cpp @@ -369,8 +369,7 @@ void Steps::SetCachedRadarValues( const RadarValues& v ) // lua start #include "LuaBinding.h" -template -class LunaSteps : public Luna +class LunaSteps: public Luna { public: LunaSteps() { LUA->Register( Register ); } diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index ca47ac2d95..9be62a94f6 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -911,8 +911,7 @@ CString ThemeManager::GetBlankGraphicPath() // lua start #include "LuaBinding.h" -template -class LunaThemeManager : public Luna +class LunaThemeManager: public Luna { public: LunaThemeManager() { LUA->Register( Register ); } diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp index c57e7288fd..8b7d2652db 100644 --- a/stepmania/src/Trail.cpp +++ b/stepmania/src/Trail.cpp @@ -186,8 +186,7 @@ bool Trail::ContainsSong( Song* pSong ) const // lua start #include "LuaBinding.h" -template -class LunaTrail : public Luna +class LunaTrail: public Luna { public: LunaTrail() { LUA->Register( Register ); } diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index d7c40d58fc..b5234664cb 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -504,8 +504,7 @@ void UnlockManager::GetStepsUnlockedByCode( vector &apSongsOut, vector -class LunaUnlockManager: public Luna +class LunaUnlockManager: public Luna { public: LunaUnlockManager() { LUA->Register( Register ); }