Update server version

This commit is contained in:
Benau 2019-03-26 02:51:45 +08:00
parent 7aa025e13c
commit 0fe162a54a
3 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@
<!-- Minimum and maxium server versions that be be read by this binary. <!-- Minimum and maxium server versions that be be read by this binary.
Older versions will be ignored. --> Older versions will be ignored. -->
<server-version min="5" max="5"/> <server-version min="6" max="6"/>
<!-- Maximum number of karts to be used at the same time. This limit <!-- Maximum number of karts to be used at the same time. This limit
can easily be increased, but some tracks might not have valid start can easily be increased, but some tracks might not have valid start

View File

@ -145,7 +145,7 @@ void loadServerConfigXML(const XMLNode* root, bool default_config)
return; return;
} }
int config_file_version = -1; /*int config_file_version = -1;
if (root->get("version", &config_file_version) < 1 || if (root->get("version", &config_file_version) < 1 ||
config_file_version < stk_config->m_min_server_version || config_file_version < stk_config->m_min_server_version ||
config_file_version > stk_config->m_max_server_version) config_file_version > stk_config->m_max_server_version)
@ -155,7 +155,7 @@ void loadServerConfigXML(const XMLNode* root, bool default_config)
delete root; delete root;
writeServerConfigToDisk(); writeServerConfigToDisk();
return; return;
} }*/
for (unsigned i = 0; i < g_server_params.size(); i++) for (unsigned i = 0; i < g_server_params.size(); i++)
g_server_params[i]->findYourDataInAChildOf(root); g_server_params[i]->findYourDataInAChildOf(root);

View File

@ -326,7 +326,7 @@ namespace ServerConfig
// ======================================================================== // ========================================================================
/** Server version, will be advanced if there are protocol changes. */ /** Server version, will be advanced if there are protocol changes. */
static const uint32_t m_server_version = 5; static const uint32_t m_server_version = 6;
// ======================================================================== // ========================================================================
void loadServerConfig(const std::string& path = ""); void loadServerConfig(const std::string& path = "");
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------