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

CString -> RString

Browse Source
This commit is contained in:
Chris Danford
2006-01-22 01:00:06 +00:00
parent 870ed267fc
commit 7f821e8cfc
578 changed files with 3943 additions and 3946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenTestInput.cpp
+8 -8
View File
@@ -56,13 +56,13 @@ void ScreenTestInput::Update( float fDeltaTime )
//
{
vector<InputDevice> vDevices;
vector<CString> vDescriptions;
vector<CString> vs;
vector<RString> vDescriptions;
vector<RString> vs;
INPUTMAN->GetDevicesAndDescriptions( vDevices, vDescriptions );
ASSERT( vDevices.size() == vDescriptions.size() );
for( unsigned i=0; i<vDevices.size(); ++i )
{
const CString sDescription = vDescriptions[i];
const RString sDescription = vDescriptions[i];
InputDevice device = vDevices[i];
if( sDescription == "MonkeyKeyboard" )
continue; // hide this
@@ -74,20 +74,20 @@ void ScreenTestInput::Update( float fDeltaTime )
//
// Update input texts
//
vector<CString> asInputs;
vector<RString> asInputs;
DeviceInput di;
vector<DeviceInput> DeviceInputs;
INPUTFILTER->GetPressedButtons( DeviceInputs );
FOREACH( DeviceInput, DeviceInputs, di )
{
CString sTemp;
RString sTemp;
sTemp += INPUTMAN->GetDeviceSpecificInputString(*di);
GameInput gi;
if( INPUTMAPPER->DeviceToGame(*di,gi) )
{
CString sName = GameButtonToLocalizedString( GAMESTATE->GetCurrentGame(), gi.button );
RString sName = GameButtonToLocalizedString( GAMESTATE->GetCurrentGame(), gi.button );
sTemp += ssprintf(" - "+CONTROLLER.GetValue()+" %d %s", gi.controller+1, sName.c_str() );
if( !PREFSMAN->m_bOnlyDedicatedMenuButtons )
@@ -102,7 +102,7 @@ void ScreenTestInput::Update( float fDeltaTime )
sTemp += " - "+NOT_MAPPED.GetValue();
}
CString sComment = INPUTFILTER->GetButtonComment( *di );
RString sComment = INPUTFILTER->GetButtonComment( *di );
if( sComment != "" )
sTemp += " - " + sComment;
@@ -115,7 +115,7 @@ void ScreenTestInput::Update( float fDeltaTime )
void ScreenTestInput::Input( const InputEventPlus &input )
{
CString sMessage = input.DeviceI.ToString();
RString sMessage = input.DeviceI.ToString();
switch( input.type )
{
case IET_FIRST_PRESS: