From e50d295c870a26353ea629e8ebaeefcfcba39af5 Mon Sep 17 00:00:00 2001 From: Fantasmos Date: Sat, 28 Oct 2017 13:05:08 +1100 Subject: [PATCH] Remvoe redundancy --- src/config/user_config.cpp | 1 - src/config/user_config.hpp | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/config/user_config.cpp b/src/config/user_config.cpp index acdd8c954..d8a529eb1 100644 --- a/src/config/user_config.cpp +++ b/src/config/user_config.cpp @@ -29,7 +29,6 @@ static PtrVector all_params; // X-macros #define PARAM_PREFIX #define PARAM_DEFAULT(X) = X - #include "config/user_config.hpp" #include "config/saved_grand_prix.hpp" diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp index c11dea614..02bbf982d 100644 --- a/src/config/user_config.hpp +++ b/src/config/user_config.hpp @@ -183,7 +183,6 @@ public: return m_elements[key]; } }; // ListUserConfigParam -typedef MapUserConfigParam StringToStringUserConfigParam; typedef MapUserConfigParam IntToIntUserConfigParam; // ============================================================================ class IntUserConfigParam : public UserConfigParam @@ -418,11 +417,7 @@ namespace UserConfigParams PARAM_PREFIX StringUserConfigParam m_last_used_kart_group PARAM_DEFAULT( StringUserConfigParam("all", "last_kart_group", "Last selected kart group") ); - // ---- Gamemode setup - - - // ---- Wiimote data PARAM_PREFIX GroupUserConfigParam m_wiimote_group PARAM_DEFAULT( GroupUserConfigParam("WiiMote", @@ -758,12 +753,15 @@ namespace UserConfigParams "stun.voxalot.com", "stun.voxgratia.org", "stun.xten.com") ); + + // ---- Gamemode setup PARAM_PREFIX IntToIntUserConfigParam m_karts_per_gamemode PARAM_DEFAULT(IntToIntUserConfigParam("karts_per_gamemode", "The Number of karts per gamemode.", 1, std::make_pair(1100, 4) )); + PARAM_PREFIX BoolUserConfigParam m_log_packets PARAM_DEFAULT( BoolUserConfigParam(false, "log-network-packets", "If all network packets should be logged") );