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

Identified cause of compile error

Browse Source
This commit is contained in:
Fantasmos 2017-10-26 09:39:48 +11:00
parent 74cdd07ba7
commit df69a684a3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/user_config.hpp
View File

@ -371,8 +371,9 @@ namespace UserConfigParams
"Last selected kart group") ); "Last selected kart group") );
// ---- Gamemode setup // ---- Gamemode setup
PARAM_PREFIX StringListUserConfigParam m_karts_per_gamemode PARAM_PREFIX StringListUserConfigParam m_karts_per_gamemode
PARAM_DEFAULT(StringListUserConfigParam("karts_per_gamemode", PARAM_DEFAULT(StringListUserConfigParam("karts_per_gamemode", "The karts per gamemode"
"Number of karts per gamemode. Order corresponds to Enum value", "Number of karts per gamemode. Order corresponds to Enum value",
10, 10,
"3", "3",
@ -385,6 +386,7 @@ namespace UserConfigParams
"3", "3",
"3", "3",
"3")); "3"));
// ---- Wiimote data // ---- Wiimote data
PARAM_PREFIX GroupUserConfigParam m_wiimote_group PARAM_PREFIX GroupUserConfigParam m_wiimote_group
PARAM_DEFAULT( GroupUserConfigParam("WiiMote", PARAM_DEFAULT( GroupUserConfigParam("WiiMote",

6
src/states_screens/track_info_screen.cpp
View File

@ -245,8 +245,10 @@ void TrackInfoScreen::init()
m_ai_kart_spinner->setValue(0); m_ai_kart_spinner->setValue(0);
m_ai_kart_spinner->setActive(false); m_ai_kart_spinner->setActive(false);
race_manager->setNumKarts(race_manager->getNumLocalPlayers()); race_manager->setNumKarts(race_manager->getNumLocalPlayers());
karts_per_gamemode[race_manager->getMinorMode()] = race_manager->getNumLocalPlayers();
UserConfigParams::m_karts_per_gamemode = karts_per_gamemode; //This is causing an error
karts_per_gamemode[race_manager->getMinorMode()] = std::to_string(race_manager->getNumLocalPlayers());
UserConfigParams::m_karts_per_gamemode = karts_per_gamemode; //Causes error
UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers(); UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers();
} }
else if (record_available) else if (record_available)