Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

game.cpp: remove dead code for proto v25 compat (#6481) 

Protocol v25 is not supported anymore
master
Loïc Blot 2017-09-30 16:41:18 +02:00 committed by GitHub
parent 8c16f18fdb
commit 9fa78b7387
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/game.cpp
View File

@ -2183,27 +2183,8 @@ bool Game::connectToServer(const std::string &playername,
wait_time += dtime; wait_time += dtime;
// Only time out if we aren't waiting for the server we started // Only time out if we aren't waiting for the server we started
if ((!address->empty()) && (wait_time > 10)) { if (!address->empty() && wait_time > 10) {
bool sent_old_init = g_settings->getFlag("send_pre_v25_init"); *error_message = "Connection timed out.";
// If no pre v25 init was sent, and no answer was received,
// but the low level connection could be established
// (meaning that we have a peer id), then we probably wanted
// to connect to a legacy server. In this case, tell the user
// to enable the option to be able to connect.
if (!sent_old_init &&
(client->getProtoVersion() == 0) &&
client->connectedToServer()) {
*error_message = "Connection failure: init packet not "
"recognized by server.\n"
"Most likely the server uses an old protocol version (<v25).\n"
"Please ask the server owner to update to 0.4.13 or later.\n"
"To still connect to the server in the meantime,\n"
"you can enable the 'send_pre_v25_init' setting by editing minetest.conf,\n"
"or by enabling the 'Client -> Network -> Support older Servers'\n"
"entry in the advanced settings menu.";
} else {
*error_message = "Connection timed out.";
}
errorstream << *error_message << std::endl; errorstream << *error_message << std::endl;
break; break;
} }