From a5f71e3cca69615255304ebbd51e7bc7bd35acee Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 4 Feb 2007 03:56:17 +0000 Subject: [PATCH] remove unused GameBaseNoteSkin metric --- stepmania/Themes/default/metrics.ini | 3 --- stepmania/src/NoteSkinManager.cpp | 6 ++---- stepmania/src/NoteSkinManager.h | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7a69891ecd..ec12982fa4 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -16,9 +16,6 @@ ScreenHeight=480 OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay" MaxCourseEntriesBeforeShowVarious=6 -[NoteSkinManager] -GameBaseNoteSkin="default" - [Gameplay] ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni" MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "TapNoteScore_W2" or "TapNoteScore_W3" diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp index 57ab290506..fc40f0ef7a 100644 --- a/stepmania/src/NoteSkinManager.cpp +++ b/stepmania/src/NoteSkinManager.cpp @@ -19,6 +19,7 @@ NoteSkinManager* NOTESKIN = NULL; // global object accessable from anywhere in t const RString NOTESKINS_DIR = "NoteSkins/"; const RString GLOBAL_BASE_NOTESKIN_DIR = NOTESKINS_DIR + "common/default/"; +const RString GAME_BASE_NOTESKIN_NAME = "default"; static map g_PathCache; struct NoteSkinData @@ -37,7 +38,6 @@ namespace NoteSkinManager::NoteSkinManager() { - GAME_BASE_NOTESKIN_NAME.Load( "NoteSkinManager", "GameBaseNoteSkin" ); m_pCurGame = NULL; // Register with Lua. @@ -133,7 +133,7 @@ void NoteSkinManager::GetNoteSkinNames( const Game* pGame, vector &AddT GetAllNoteSkinNamesForGame( pGame, AddTo ); /* Move "default" to the front if it exists. */ - vector::iterator iter = find( AddTo.begin(), AddTo.end(), GAME_BASE_NOTESKIN_NAME.GetValue() ); + vector::iterator iter = find( AddTo.begin(), AddTo.end(), GAME_BASE_NOTESKIN_NAME ); if( iter != AddTo.end() ) { AddTo.erase( iter ); @@ -337,13 +337,11 @@ class LunaNoteSkinManager: public Luna public: static int GetPath( T* p, lua_State *L ) { lua_pushstring(L, p->GetPath(SArg(1),SArg(2)) ); return 1; } static int GetMetricA( T* p, lua_State *L ) { p->GetMetricA(SArg(1),SArg(2))->PushSelf(L); return 1; } - DEFINE_METHOD( GetGameBaseNoteSkinName, GAME_BASE_NOTESKIN_NAME.GetValue() ) LunaNoteSkinManager() { ADD_METHOD( GetPath ); ADD_METHOD( GetMetricA ); - ADD_METHOD( GetGameBaseNoteSkinName ); } }; diff --git a/stepmania/src/NoteSkinManager.h b/stepmania/src/NoteSkinManager.h index 9e3fce6181..2e65a73df9 100644 --- a/stepmania/src/NoteSkinManager.h +++ b/stepmania/src/NoteSkinManager.h @@ -7,7 +7,6 @@ #include "RageTypes.h" #include "PlayerNumber.h" #include "IniFile.h" -#include "ThemeMetric.h" class Game; struct NoteSkinData; @@ -34,7 +33,6 @@ public: float GetMetricF( const RString &sButtonName, const RString &sValueName ); bool GetMetricB( const RString &sButtonName, const RString &sValueName ); apActorCommands GetMetricA( const RString &sButtonName, const RString &sValueName ); - ThemeMetric GAME_BASE_NOTESKIN_NAME; // Lua void PushSelf( lua_State *L );