lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow using --worldname for local game too

master
Perttu Ahola 2012-05-20 17:41:40 +03:00
parent 49d9745dc4
commit 388906ac70
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main.cpp
View File

@ -1037,6 +1037,31 @@ int main(int argc, char *argv[])
} }
} }
// If a world name was specified, convert it to a path
if(commanded_worldname != ""){
// Get information about available worlds
std::vector<WorldSpec> worldspecs = getAvailableWorlds();
bool found = false;
for(u32 i=0; i<worldspecs.size(); i++){
std::string name = worldspecs[i].name;
if(name == commanded_worldname){
if(commanded_world != ""){
dstream<<"--worldname takes precedence over previously "
<<"selected world."<<std::endl;
}
commanded_world = worldspecs[i].path;
found = true;
break;
}
}
if(!found){
dstream<<"World '"<<commanded_worldname<<"' not "
<<"available. Available worlds:"<<std::endl;
print_worldspecs(worldspecs, dstream);
return 1;
}
}
// Gamespec // Gamespec
SubgameSpec commanded_gamespec; SubgameSpec commanded_gamespec;
if(cmd_args.exists("gameid")){ if(cmd_args.exists("gameid")){
@ -1074,25 +1099,6 @@ int main(int argc, char *argv[])
infostream<<"Using commanded world path ["<<world_path<<"]" infostream<<"Using commanded world path ["<<world_path<<"]"
<<std::endl; <<std::endl;
} }
// If a world name was specified, select it
else if(commanded_worldname != ""){
// Get information about available worlds
std::vector<WorldSpec> worldspecs = getAvailableWorlds();
world_path = "";
for(u32 i=0; i<worldspecs.size(); i++){
std::string name = worldspecs[i].name;
if(name == commanded_worldname){
world_path = worldspecs[i].path;
break;
}
}
if(world_path == ""){
dstream<<"World '"<<commanded_worldname<<"' not "
<<"available. Available worlds:"<<std::endl;
print_worldspecs(worldspecs, dstream);
return 1;
}
}
// No world was specified; try to select it automatically // No world was specified; try to select it automatically
else else
{ {
@ -1207,8 +1213,6 @@ int main(int argc, char *argv[])
address = ""; address = "";
else if(cmd_args.exists("address")) else if(cmd_args.exists("address"))
address = cmd_args.get("address"); address = cmd_args.get("address");
else if(cmd_args.exists("world"))
address = "";
std::string playername = g_settings->get("name"); std::string playername = g_settings->get("name");
if(cmd_args.exists("name")) if(cmd_args.exists("name"))