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

Highlighted issue that needs resolving

Browse Source
This commit is contained in:
Fantasmos 2017-10-28 12:09:23 +11:00
parent 4fbc39572b
commit 4a0db1926d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/user_config.cpp
View File

@ -346,9 +346,9 @@ MapUserConfigParam<T, U>::MapUserConfigParam(const char* param_name,
// add the default list
va_list arguments;
va_start(arguments, nb_elements);
typedef std::pair<T, U> DictThing;
typedef std::pair<T, U> PairType; //Necessary to prevent compile error below
for (int i = 0; i < nb_elements; i++) {
std::pair<T, U> key_value_pair = va_arg(arguments, DictThing);
std::pair<T, U> key_value_pair = va_arg(arguments, PairType);
m_elements.insert(key_value_pair);
}
va_end(arguments); // Cleans up the list
@ -380,9 +380,9 @@ MapUserConfigParam<T, U>::MapUserConfigParam(const char* param_name,
// add the default list
va_list arguments;
va_start(arguments, nb_elements);
typedef std::pair<T, U> PairType; //Necessary to prevent compile error below
for (int i = 0; i < nb_elements; i++) {
std::pair<T, U> key_value_pair = va_arg(arguments, DictThing);
std::pair<T, U> key_value_pair = va_arg(arguments, PairType);
m_elements.insert(key_value_pair);
}
va_end(arguments); // Cleans up the list

2
src/states_screens/track_info_screen.cpp
View File

@ -164,7 +164,7 @@ void TrackInfoScreen::init()
m_ai_kart_spinner->setVisible(has_AI);
getWidget<LabelWidget>("ai-text")->setVisible(has_AI);
UserConfigParams::m_num_karts;
std::map<int , int> karts_per_gamemode = UserConfigParams::m_karts_per_gamemode;
if (has_AI)