From 25b8421da07c00d06a3d34eef23085bb3cda4499 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 15 Jun 2006 03:16:55 +0000 Subject: [PATCH] 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. --- stepmania/src/SongOptions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp index 3d8c6946e3..8441a35dda 100644 --- a/stepmania/src/SongOptions.cpp +++ b/stepmania/src/SongOptions.cpp @@ -107,12 +107,12 @@ void SongOptions::FromString( const RString &sOptions ) Regex mult("^([0-9]+(\\.[0-9]+)?)xmusic$"); vector matches; if( mult.Compare(sBit, matches) ) - ::FromString( matches[0], m_fMusicRate ); + m_fMusicRate = StringToFloat( matches[0] ); matches.clear(); Regex lives("^([0-9]+) ?(lives|life)$"); if( lives.Compare(sBit, matches) ) - ::FromString( matches[0], m_iBatteryLives ); + m_iBatteryLives = atoi( matches[0] ); vector asParts; split( sBit, " ", asParts, true );