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

fromString -> FromString

Browse Source 
toString -> ToString const
This commit is contained in:
Steve Checkoway
2006-09-02 20:24:39 +00:00
parent cff13747a6
commit 74ad63769f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameInput.cpp
+2 -2
View File
@@ -35,12 +35,12 @@ GameButton StringToGameButton( const Game* pGame, const RString& s )
}
RString GameInput::toString( const Game* pGame )
RString GameInput::ToString( const Game* pGame ) const
{
return GameControllerToString(controller) + RString("_") + GameButtonToString(pGame,button);
}
bool GameInput::fromString( const Game* pGame, RString s )
bool GameInput::FromString( const Game* pGame, const RString &s )
{
char szController[32] = "";
char szButton[32] = "";
stepmania/src/GameInput.h
+2 -2
View File
@@ -265,8 +265,8 @@ struct GameInput
inline bool IsValid() const { return controller != GAME_CONTROLLER_INVALID; };
inline void MakeInvalid() { controller = GAME_CONTROLLER_INVALID; button = GAME_BUTTON_INVALID; };
RString toString( const Game* pGame );
bool fromString( const Game* pGame, RString s );
RString ToString( const Game* pGame ) const;
bool FromString( const Game* pGame, const RString &s );
};
#endif
stepmania/src/InputMapper.cpp
+2 -2
View File
@@ -559,7 +559,7 @@ void InputMapper::ReadMappingsFromDisk()
const RString &value = i->second;
GameInput GameI;
GameI.fromString( pGame, name );
GameI.FromString( pGame, name );
vector<RString> sDeviceInputStrings;
split( value, DEVICE_INPUT_SEPARATOR, sDeviceInputStrings, false );
@@ -593,7 +593,7 @@ void InputMapper::SaveMappingsToDisk()
for( int j=0; j<pGame->m_iButtonsPerController; j++ )
{
GameInput GameI( i, (GameButton)j );
RString sNameString = GameI.toString( pGame );
RString sNameString = GameI.ToString( pGame );
vector<RString> asValues;
for( int slot = 0; slot < NUM_USER_GAME_TO_DEVICE_SLOTS; ++slot ) // don't save data from the last (keyboard automap) slot