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

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
Alayan 2019-04-17 17:09:46 +02:00
commit 201db403f9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/replay/standard_reverse_supertux_olivermath.replay
View File

@ -8,7 +8,7 @@ difficulty: 3
mode: time-trial mode: time-trial
track: olivermath track: olivermath
laps: 6 laps: 6
min_time: 78.728027 min_time: 78.733
replay_uid: 698084198394007800 replay_uid: 698084198394007800
size: 1263 size: 1263
0.000000 -15.561723 0.198496 -3.274259 0.000000 0.999988 0.000000 -0.004796 0.000000 0.000000 0.291244 0.291244 0.291244 0.291244 0 0 0.000000 6 4 0 -1.458740 0 0 0 0 0 0.000000 -15.561723 0.198496 -3.274259 0.000000 0.999988 0.000000 -0.004796 0.000000 0.000000 0.291244 0.291244 0.291244 0.291244 0 0 0.000000 6 4 0 -1.458740 0 0 0 0 0

2
lib/libpng/pngread.c
View File

@ -1089,7 +1089,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr,
free_fn = png_ptr->free_fn; free_fn = png_ptr->free_fn;
#endif #endif
png_memset(png_ptr, 0, png_sizeof(png_struct)); png_memset((png_voidp)png_ptr, 0, png_sizeof(png_struct));
png_ptr->error_fn = error_fn; png_ptr->error_fn = error_fn;
#ifdef PNG_WARNINGS_SUPPORTED #ifdef PNG_WARNINGS_SUPPORTED

4
src/network/server_config.cpp
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);