1
0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 00:25:19 +02:00

Merge remote-tracking branch 'origin/upstream'

This commit is contained in:
Nils Dagsson Moskopp
2011-07-31 20:04:04 +02:00
30 changed files with 233 additions and 52 deletions

View File

@@ -1579,6 +1579,8 @@ int main(int argc, char *argv[])
password = translatePassword(playername, menudata.password);
//dstream<<"Main: password hash: '"<<password<<"'"<<std::endl;
address = wide_to_narrow(menudata.address);
int newport = stoi(wide_to_narrow(menudata.port));
if(newport != 0)