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

Update server version

Browse Source 
At the moment ignore server config before final release
This commit is contained in:
Benau 2018-09-28 17:41:45 +08:00
parent ae4ed9e2e7
commit 8efd422125
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/stk_config.xml
View File

@ -11,7 +11,7 @@
<!-- Minimum and maxium server versions that be be read by this binary.
Older versions will be ignored. -->
<server-version min="1" max="1"/>
<server-version min="2" max="2"/>
<!-- 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

4
src/network/server_config.cpp
View File

@ -136,7 +136,7 @@ void loadServerConfigXML(const XMLNode* root)
return;
}
int config_file_version = -1;
/*int 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_max_server_version)
@ -146,7 +146,7 @@ void loadServerConfigXML(const XMLNode* root)
delete root;
writeServerConfigToDisk();
return;
}
}*/
for (unsigned i = 0; i < g_server_params.size(); i++)
g_server_params[i]->findYourDataInAChildOf(root);

2
src/network/server_config.hpp
View File

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