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

12
data/stk_config.xml
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="1" max="1"/> <server-version min="2" max="2"/>
<!-- 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
@ -114,7 +114,7 @@
that the bit is to be set to 0, otherwise the bit will be set. that the bit is to be set to 0, otherwise the bit will be set.
This field takes two This field takes two
values: the first value is 'and'ed with bullet's default values values: the first value is 'and'ed with bullet's default values
(i.e. it can be used to unset bullet defaults), the second value (i.e. it can be used to unset bullet defaults), the second value
is 'or'ed (i.e. is used to set a bit). A value of -1 for 'and' is 'or'ed (i.e. is used to set a bit). A value of -1 for 'and'
means to keep all bits. The valid names are listed in stk_config.cpp means to keep all bits. The valid names are listed in stk_config.cpp
@ -125,7 +125,7 @@
smooth-angle-limit="0.65" smooth-angle-limit="0.65"
fps="120" fps="120"
default-track-friction="0.5" default-track-friction="0.5"
default-moveable-friction="0.5" default-moveable-friction="0.5"
solver-iterations="4" solver-iterations="4"
solver-split-impulse="true" solver-split-impulse="true"
solver-split-impulse-threshold="-0.00001" solver-split-impulse-threshold="-0.00001"
@ -149,14 +149,14 @@
<replay max-frames="12000" delta-t="0.200" delta-speed="0.6" <replay max-frames="12000" delta-t="0.200" delta-speed="0.6"
delta-steering="0.35" /> delta-steering="0.35" />
<!-- Determines the minimap related values. <!-- Determines the minimap related values.
size: The size of the minimap (scaled afterwards) 480 = full screen height) size: The size of the minimap (scaled afterwards) 480 = full screen height)
ai-icon: The size of the icons for the AI karts on the minimap. ai-icon: The size of the icons for the AI karts on the minimap.
player-icon: The size of the icons for the player karts. --> player-icon: The size of the icons for the player karts. -->
<minimap size="180.0" ai-icon="16.0" player-icon="20.0"/> <minimap size="180.0" ai-icon="16.0" player-icon="20.0"/>
<urls donate="https://supertuxkart.net/Donate" <urls donate="https://supertuxkart.net/Donate"
password-reset="http://addons.supertuxkart.net/password-reset.php" /> password-reset="http://addons.supertuxkart.net/password-reset.php" />
<!-- Skidmark data: maximum number of skid marks, and <!-- Skidmark data: maximum number of skid marks, and
@ -201,7 +201,7 @@
away if there is an explosion. --> away if there is an explosion. -->
<explosion impulse-objects="500.0" /> <explosion impulse-objects="500.0" />
<!-- Networking <!-- Networking
state-frequency: how many states the server will send per second. state-frequency: how many states the server will send per second.
steering-reduction: Reduce a remote kart's steering by this factor steering-reduction: Reduce a remote kart's steering by this factor
each frame. This helps reduces oversteering by high latency each frame. This helps reduces oversteering by high latency

4
src/network/server_config.cpp
View File

@ -136,7 +136,7 @@ void loadServerConfigXML(const XMLNode* root)
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)
@ -146,7 +146,7 @@ void loadServerConfigXML(const XMLNode* root)
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);

2
src/network/server_config.hpp
View File

@ -269,7 +269,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 = 1; static const uint32_t m_server_version = 2;
// ======================================================================== // ========================================================================
void loadServerConfig(const std::string& path = ""); void loadServerConfig(const std::string& path = "");
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------