actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove unused GameBaseNoteSkin metric

Browse Source
This commit is contained in:
Glenn Maynard
2007-02-04 03:56:17 +00:00
parent ea316d22a0
commit a5f71e3cca
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
-3
View File
@@ -16,9 +16,6 @@ ScreenHeight=480
OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay" OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay"
MaxCourseEntriesBeforeShowVarious=6 MaxCourseEntriesBeforeShowVarious=6
[NoteSkinManager]
GameBaseNoteSkin="default"
[Gameplay] [Gameplay]
ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni" ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni"
MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "TapNoteScore_W2" or "TapNoteScore_W3" MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "TapNoteScore_W2" or "TapNoteScore_W3"
stepmania/src/NoteSkinManager.cpp
+2 -4
View File
@@ -19,6 +19,7 @@ NoteSkinManager* NOTESKIN = NULL; // global object accessable from anywhere in t
const RString NOTESKINS_DIR = "NoteSkins/"; const RString NOTESKINS_DIR = "NoteSkins/";
const RString GLOBAL_BASE_NOTESKIN_DIR = NOTESKINS_DIR + "common/default/"; const RString GLOBAL_BASE_NOTESKIN_DIR = NOTESKINS_DIR + "common/default/";
const RString GAME_BASE_NOTESKIN_NAME = "default";
static map<RString,RString> g_PathCache; static map<RString,RString> g_PathCache;
struct NoteSkinData struct NoteSkinData
@@ -37,7 +38,6 @@ namespace
NoteSkinManager::NoteSkinManager() NoteSkinManager::NoteSkinManager()
{ {
GAME_BASE_NOTESKIN_NAME.Load( "NoteSkinManager", "GameBaseNoteSkin" );
m_pCurGame = NULL; m_pCurGame = NULL;
// Register with Lua. // Register with Lua.
@@ -133,7 +133,7 @@ void NoteSkinManager::GetNoteSkinNames( const Game* pGame, vector<RString> &AddT
GetAllNoteSkinNamesForGame( pGame, AddTo ); GetAllNoteSkinNamesForGame( pGame, AddTo );
/* Move "default" to the front if it exists. */ /* Move "default" to the front if it exists. */
vector<RString>::iterator iter = find( AddTo.begin(), AddTo.end(), GAME_BASE_NOTESKIN_NAME.GetValue() ); vector<RString>::iterator iter = find( AddTo.begin(), AddTo.end(), GAME_BASE_NOTESKIN_NAME );
if( iter != AddTo.end() ) if( iter != AddTo.end() )
{ {
AddTo.erase( iter ); AddTo.erase( iter );
@@ -337,13 +337,11 @@ class LunaNoteSkinManager: public Luna<NoteSkinManager>
public: public:
static int GetPath( T* p, lua_State *L ) { lua_pushstring(L, p->GetPath(SArg(1),SArg(2)) ); return 1; } 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; } 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() LunaNoteSkinManager()
{ {
ADD_METHOD( GetPath ); ADD_METHOD( GetPath );
ADD_METHOD( GetMetricA ); ADD_METHOD( GetMetricA );
ADD_METHOD( GetGameBaseNoteSkinName );
} }
}; };
stepmania/src/NoteSkinManager.h
-2
View File
@@ -7,7 +7,6 @@
#include "RageTypes.h" #include "RageTypes.h"
#include "PlayerNumber.h" #include "PlayerNumber.h"
#include "IniFile.h" #include "IniFile.h"
#include "ThemeMetric.h"
class Game; class Game;
struct NoteSkinData; struct NoteSkinData;
@@ -34,7 +33,6 @@ public:
float GetMetricF( const RString &sButtonName, const RString &sValueName ); float GetMetricF( const RString &sButtonName, const RString &sValueName );
bool GetMetricB( const RString &sButtonName, const RString &sValueName ); bool GetMetricB( const RString &sButtonName, const RString &sValueName );
apActorCommands GetMetricA( const RString &sButtonName, const RString &sValueName ); apActorCommands GetMetricA( const RString &sButtonName, const RString &sValueName );
ThemeMetric<RString> GAME_BASE_NOTESKIN_NAME;
// Lua // Lua
void PushSelf( lua_State *L ); void PushSelf( lua_State *L );