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

[MusicWheel, RoomWheel] Moved the "- EMPTY -" string to the languages file. [AJ]

Browse Source
This commit is contained in:
AJ Kelly
2011-08-01 16:58:54 -05:00
parent 711b285e61
commit 701034219f
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.cpp
+4 -1
View File
@@ -21,6 +21,7 @@
#include "PlayerState.h"
#include "CommonMetrics.h"
#include "MessageManager.h"
#include "LocalizedString.h"
static Preference<bool> g_bMoveRandomToEnd( "MoveRandomToEnd", false );
static Preference<bool> g_bPrecacheAllSorts( "PreCacheAllWheelSorts", false);
@@ -34,6 +35,8 @@ static RString CHOICE_NAME( RString s ) { return ssprintf("Choice%s",s.c_str())
static RString CUSTOM_WHEEL_ITEM_NAME( RString s ) { return ssprintf("CustomWheelItem%s",s.c_str()); }
static RString CUSTOM_WHEEL_ITEM_COLOR( RString s ) { return ssprintf("%sColor",s.c_str()); }
static LocalizedString EMPTY_STRING ( "MusicWheel", "Empty" );
AutoScreenMessage( SM_SongChanged ); // TODO: Replace this with a Message and MESSAGEMAN
AutoScreenMessage( SM_SortOrderChanging );
AutoScreenMessage( SM_SortOrderChanged );
@@ -1039,7 +1042,7 @@ void MusicWheel::FilterWheelItemDatas(vector<MusicWheelItemData *> &aUnFilteredD
// If we've filtered all items, insert a dummy.
if( aFilteredData.empty() )
aFilteredData.push_back( new MusicWheelItemData(TYPE_SECTION, NULL, "- EMPTY -", NULL, RageColor(1,0,0,1), 0) );
aFilteredData.push_back( new MusicWheelItemData(TYPE_SECTION, NULL, EMPTY_STRING, NULL, RageColor(1,0,0,1), 0) );
}
void MusicWheel::UpdateSwitch()
src/RoomWheel.cpp
+4 -1
View File
@@ -7,6 +7,9 @@
#include "NetworkSyncManager.h"
#include "ScreenManager.h"
#include "ActorUtil.h"
#include "LocalizedString.h"
static LocalizedString EMPTY_STRING ( "RoomWheel", "Empty" );
AutoScreenMessage( SM_BackFromRoomName );
AutoScreenMessage( SM_RoomInfoRetract );
@@ -87,7 +90,7 @@ void RoomWheelItem::Load( RString sType )
void RoomWheel::BuildWheelItemsData( vector<WheelItemBaseData*> &arrayWheelItemDatas )
{
if( arrayWheelItemDatas.empty() )
arrayWheelItemDatas.push_back( new RoomWheelItemData(TYPE_GENERIC, "- EMPTY -", "", RageColor(1,0,0,1)) );
arrayWheelItemDatas.push_back( new RoomWheelItemData(TYPE_GENERIC, EMPTY_STRING, "", RageColor(1,0,0,1)) );
}
void RoomWheel::AddPermanentItem( RoomWheelItemData *itemdata )