I'm not crazy about overloading "FromString" names: it's hard to tell
where they're used from a search. It's useful for overloaded things (templates and macros), but since we have "FloatToString", let's prefer that.
This commit is contained in:
@@ -107,12 +107,12 @@ void SongOptions::FromString( const RString &sOptions )
|
|||||||
Regex mult("^([0-9]+(\\.[0-9]+)?)xmusic$");
|
Regex mult("^([0-9]+(\\.[0-9]+)?)xmusic$");
|
||||||
vector<RString> matches;
|
vector<RString> matches;
|
||||||
if( mult.Compare(sBit, matches) )
|
if( mult.Compare(sBit, matches) )
|
||||||
::FromString( matches[0], m_fMusicRate );
|
m_fMusicRate = StringToFloat( matches[0] );
|
||||||
|
|
||||||
matches.clear();
|
matches.clear();
|
||||||
Regex lives("^([0-9]+) ?(lives|life)$");
|
Regex lives("^([0-9]+) ?(lives|life)$");
|
||||||
if( lives.Compare(sBit, matches) )
|
if( lives.Compare(sBit, matches) )
|
||||||
::FromString( matches[0], m_iBatteryLives );
|
m_iBatteryLives = atoi( matches[0] );
|
||||||
|
|
||||||
vector<RString> asParts;
|
vector<RString> asParts;
|
||||||
split( sBit, " ", asParts, true );
|
split( sBit, " ", asParts, true );
|
||||||
|
|||||||
Reference in New Issue
Block a user