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

Added string array for karts per gamemode, and references to it to replace num_karts

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

15
src/config/user_config.hpp
View File

@ -369,7 +369,22 @@ namespace UserConfigParams
PARAM_PREFIX StringUserConfigParam m_last_used_kart_group PARAM_PREFIX StringUserConfigParam m_last_used_kart_group
PARAM_DEFAULT( StringUserConfigParam("all", "last_kart_group", PARAM_DEFAULT( StringUserConfigParam("all", "last_kart_group",
"Last selected kart group") ); "Last selected kart group") );
// ---- Gamemode setup
PARAM_PREFIX StringListUserConfigParam m_karts_per_gamemode
PARAM_DEFAULT(StringListUserConfigParam("karts_per_gamemode",
"Number of karts per gamemode. Order corresponds to Enum value",
10,
"3",
"3",
"3",
"3",
"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",

9
src/states_screens/track_info_screen.cpp
View File

@ -163,15 +163,20 @@ void TrackInfoScreen::init()
race_manager->hasAI()); race_manager->hasAI());
m_ai_kart_spinner->setVisible(has_AI); m_ai_kart_spinner->setVisible(has_AI);
getWidget<LabelWidget>("ai-text")->setVisible(has_AI); getWidget<LabelWidget>("ai-text")->setVisible(has_AI);
std::vector<std::string> karts_per_gamemode = UserConfigParams::m_karts_per_gamemode;
if (has_AI) if (has_AI)
{ {
m_ai_kart_spinner->setActive(true); m_ai_kart_spinner->setActive(true);
int num_ai = stoi(karts_per_gamemode[race_manager->getMinorMode()]) - local_players;
// Avoid negative numbers (which can happen if e.g. the number of karts // Avoid negative numbers (which can happen if e.g. the number of karts
// in a previous race was lower than the number of players now. // in a previous race was lower than the number of players now.
int num_ai = UserConfigParams::m_num_karts - local_players;
if (num_ai < 0) num_ai = 0; if (num_ai < 0) num_ai = 0;
m_ai_kart_spinner->setValue(num_ai); m_ai_kart_spinner->setValue(num_ai);
race_manager->setNumKarts(num_ai + local_players); race_manager->setNumKarts(num_ai + local_players);
// Set the max karts supported based on the battle arena selected // Set the max karts supported based on the battle arena selected
if(race_manager->getMinorMode()==RaceManager::MINOR_MODE_3_STRIKES || if(race_manager->getMinorMode()==RaceManager::MINOR_MODE_3_STRIKES ||
@ -240,6 +245,8 @@ 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;
UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers(); UserConfigParams::m_num_karts = race_manager->getNumLocalPlayers();
} }
else if (record_available) else if (record_available)