diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index fdf32af36f..02293a2b97 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -247,34 +247,6 @@ static void LuaHoldNoteScores( lua_State* L ) REGISTER_WITH_LUA_FUNCTION( LuaHoldNoteScores ); -static const CString TimingWindowNames[] = { - "W1", - "W2", - "W3", - "W4", - "W5", - "Mine", - "Attack", - "Hold", - "Roll", -}; -XToString( TimingWindow, NUM_TimingWindow ); - - -static const CString ScoreEventNames[] = { - "W1", - "W2", - "W3", - "W4", - "W5", - "Miss", - "HitMine", - "Held", - "LetGo", -}; -XToString( ScoreEvent, NUM_ScoreEvent ); - - static const CString MemoryCardStateNames[] = { "ready", "checking", diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index d057f4bcda..97859ef89b 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -173,7 +173,6 @@ enum TimingWindow TW_Roll, NUM_TimingWindow }; -const CString& TimingWindowToString( TimingWindow i ); enum ScoreEvent @@ -189,7 +188,6 @@ enum ScoreEvent SE_LetGo, NUM_ScoreEvent }; -const CString& ScoreEventToString( ScoreEvent i ); // diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index df527b76ad..dd244cd016 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -20,6 +20,34 @@ PrefsManager* PREFSMAN = NULL; // global and accessable from anywhere in our pro const CString DEFAULT_LIGHTS_DRIVER = "Null"; +static const CString TimingWindowNames[] = { + "W1", + "W2", + "W3", + "W4", + "W5", + "Mine", + "Attack", + "Hold", + "Roll", +}; +XToString( TimingWindow, NUM_TimingWindow ); + + +static const CString ScoreEventNames[] = { + "W1", + "W2", + "W3", + "W4", + "W5", + "Miss", + "HitMine", + "Held", + "LetGo", +}; +XToString( ScoreEvent, NUM_ScoreEvent ); + + // // For self-registering prefs //