[splittiming] merge

2011-05-12 16:56:15 +07:00
parent eda727ddf9 68b391481d
commit 2507cf7c0a
55 changed files with 1254 additions and 267 deletions
@@ -209,7 +209,7 @@ void GameState::ApplyCmdline()
 	RString sPlayer;
 	for( int i = 0; GetCommandlineArgument( "player", &sPlayer, i ); ++i )
 	{
-		int pn = atoi( sPlayer )-1;
+		int pn = StringToInt( sPlayer )-1;
 		if( !IsAnInt( sPlayer ) || pn < 0 || pn >= NUM_PLAYERS )
 			RageException::Throw( "Invalid argument \"--player=%s\".", sPlayer.c_str() );