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

fix compilation failure due to merging

Browse Source
This commit is contained in:
konstin 2014-05-31 16:50:01 +02:00
parent b7b116634d
commit 6bf1a33ddc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@ -361,7 +361,7 @@ void gamepadVisualisation()
} // gamepadVisualisation } // gamepadVisualisation
// ============================================================================ // ============================================================================
/** Sets the hat mesh name depending on the current christmas mode /** Sets the hat mesh name depending on the current christmas mode
* m_xmas_mode (0: use current date, 1: always on, 2: always off). * m_xmas_mode (0: use current date, 1: always on, 2: always off).
*/ */
void handleXmasMode() void handleXmasMode()
@ -847,14 +847,14 @@ int handleCmdLine()
if(CommandLine::has("--gp", &s)) if(CommandLine::has("--gp", &s))
{ {
race_manager->setMajorMode(RaceManager::MAJOR_MODE_GRAND_PRIX); race_manager->setMajorMode(RaceManager::MAJOR_MODE_GRAND_PRIX);
const GrandPrixData *gp = grand_prix_manager->getGrandPrix(s); GrandPrixData *gp = grand_prix_manager->getGrandPrix(s);
if (!gp) if (!gp)
{ {
Log::warn("main", "There is no GP named '%s'.", s.c_str()); Log::warn("main", "There is no GP named '%s'.", s.c_str());
return 0; return 0;
} }
race_manager->setGrandPrix(*gp); race_manager->setGrandPrix(gp);
} // --gp } // --gp
if(CommandLine::has("--numkarts", &n) ||CommandLine::has("-k", &n)) if(CommandLine::has("--numkarts", &n) ||CommandLine::has("-k", &n))