diff --git a/data/replay/standard_reverse_supertux_olivermath.replay b/data/replay/standard_reverse_supertux_olivermath.replay index 2121029f2..fce5cf7d6 100644 --- a/data/replay/standard_reverse_supertux_olivermath.replay +++ b/data/replay/standard_reverse_supertux_olivermath.replay @@ -8,7 +8,7 @@ difficulty: 3 mode: time-trial track: olivermath laps: 6 -min_time: 78.728027 +min_time: 78.733 replay_uid: 698084198394007800 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 diff --git a/lib/libpng/pngread.c b/lib/libpng/pngread.c index b90e017e6..df1b237b8 100644 --- a/lib/libpng/pngread.c +++ b/lib/libpng/pngread.c @@ -1089,7 +1089,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, free_fn = png_ptr->free_fn; #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; #ifdef PNG_WARNINGS_SUPPORTED diff --git a/src/network/server_config.cpp b/src/network/server_config.cpp index 8be42df69..8ba52b05e 100644 --- a/src/network/server_config.cpp +++ b/src/network/server_config.cpp @@ -145,7 +145,7 @@ void loadServerConfigXML(const XMLNode* root, bool default_config) 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) @@ -155,7 +155,7 @@ void loadServerConfigXML(const XMLNode* root, bool default_config) delete root; writeServerConfigToDisk(); return; - }*/ + } for (unsigned i = 0; i < g_server_params.size(); i++) g_server_params[i]->findYourDataInAChildOf(root);