Remvoe redundancy

This commit is contained in:
Fantasmos 2017-10-28 13:05:08 +11:00
parent d366dd84cd
commit e50d295c87
2 changed files with 3 additions and 6 deletions

View File

@ -29,7 +29,6 @@ static PtrVector<UserConfigParam, REF> all_params;
// X-macros // X-macros
#define PARAM_PREFIX #define PARAM_PREFIX
#define PARAM_DEFAULT(X) = X #define PARAM_DEFAULT(X) = X
#include "config/user_config.hpp" #include "config/user_config.hpp"
#include "config/saved_grand_prix.hpp" #include "config/saved_grand_prix.hpp"

View File

@ -183,7 +183,6 @@ public:
return m_elements[key]; return m_elements[key];
} }
}; // ListUserConfigParam }; // ListUserConfigParam
typedef MapUserConfigParam<const char*, const char*> StringToStringUserConfigParam;
typedef MapUserConfigParam<int, int> IntToIntUserConfigParam; typedef MapUserConfigParam<int, int> IntToIntUserConfigParam;
// ============================================================================ // ============================================================================
class IntUserConfigParam : public UserConfigParam class IntUserConfigParam : public UserConfigParam
@ -418,11 +417,7 @@ 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
// ---- Wiimote data // ---- Wiimote data
PARAM_PREFIX GroupUserConfigParam m_wiimote_group PARAM_PREFIX GroupUserConfigParam m_wiimote_group
PARAM_DEFAULT( GroupUserConfigParam("WiiMote", PARAM_DEFAULT( GroupUserConfigParam("WiiMote",
@ -758,12 +753,15 @@ namespace UserConfigParams
"stun.voxalot.com", "stun.voxalot.com",
"stun.voxgratia.org", "stun.voxgratia.org",
"stun.xten.com") ); "stun.xten.com") );
// ---- Gamemode setup
PARAM_PREFIX IntToIntUserConfigParam m_karts_per_gamemode PARAM_PREFIX IntToIntUserConfigParam m_karts_per_gamemode
PARAM_DEFAULT(IntToIntUserConfigParam("karts_per_gamemode", PARAM_DEFAULT(IntToIntUserConfigParam("karts_per_gamemode",
"The Number of karts per gamemode.", "The Number of karts per gamemode.",
1, 1,
std::make_pair(1100, 4) std::make_pair(1100, 4)
)); ));
PARAM_PREFIX BoolUserConfigParam m_log_packets PARAM_PREFIX BoolUserConfigParam m_log_packets
PARAM_DEFAULT( BoolUserConfigParam(false, "log-network-packets", PARAM_DEFAULT( BoolUserConfigParam(false, "log-network-packets",
"If all network packets should be logged") ); "If all network packets should be logged") );