ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable checking if kart/track is locked when launching from terminal, avoids crash

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10404 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-12-12 01:03:44 +00:00
parent 66c41037ed
commit ed432fbdf4
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@@ -702,7 +702,10 @@ int handleCmdLine(int argc, char **argv)
}
else if( (!strcmp(argv[i], "--kart") && i+1<argc ))
{
if (!unlock_manager->getCurrentSlot()->isLocked(argv[i+1]))
// This doesn't work anymore because now we support multiple players
// and currently do not know which player profile to use since it
// wasn't selected yet
//if (!unlock_manager->getCurrentSlot()->isLocked(argv[i+1]))
{
const KartProperties *prop =
kart_properties_manager->getKart(argv[i+1]);
@@ -727,6 +730,7 @@ int handleCmdLine(int argc, char **argv)
argv[i+1]);
}
}
/*
else
{
fprintf(stdout, "Kart %s has not been unlocked yet. \n",
@@ -735,6 +739,7 @@ int handleCmdLine(int argc, char **argv)
"Use --list-karts to list available karts.\n\n");
return 0;
}
*/
}
else if( sscanf(argv[i], "--ai=%s", s)==1)
{
@@ -763,7 +768,10 @@ int handleCmdLine(int argc, char **argv)
else if( (!strcmp(argv[i], "--track") || !strcmp(argv[i], "-t"))
&& i+1<argc )
{
if (!unlock_manager->getCurrentSlot()->isLocked(argv[i+1]))
// This doesn't work anymore because now we support multiple players
// and currently do not know which player profile to use since it
// wasn't selected yet
//if (!unlock_manager->getCurrentSlot()->isLocked(argv[i+1]))
{
race_manager->setTrack(argv[i+1]);
fprintf ( stdout, "You choose to start in track: %s.\n",
@@ -781,6 +789,7 @@ int handleCmdLine(int argc, char **argv)
RaceManager::MINOR_MODE_3_STRIKES);
}
}
/*
else
{
fprintf(stdout, "Track %s has not been unlocked yet. \n",
@@ -789,6 +798,7 @@ int handleCmdLine(int argc, char **argv)
"tracks.\n\n");
return 0;
}
*/
i++;
}
else if( (!strcmp(argv[i], "--gp")) && i+1<argc)