// Connection
std::ostream *dout_con_ptr = &dummyout;
std::ostream *derr_con_ptr = &verbosestream;
-//std::ostream *dout_con_ptr = &infostream;
-//std::ostream *derr_con_ptr = &errorstream;
// Server
std::ostream *dout_server_ptr = &infostream;
}
}
+static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
+ std::ostream &os)
+{
+ for(u32 i=0; i<worldspecs.size(); i++){
+ std::string name = worldspecs[i].name;
+ std::string path = worldspecs[i].path;
+ if(name.find(" ") != std::string::npos)
+ name = std::string("'") + name + "'";
+ path = std::string("'") + path + "'";
+ name = padStringRight(name, 14);
+ os<<" "<<name<<" "<<path<<std::endl;
+ }
+}
+
int main(int argc, char *argv[])
{
int retval = 0;
"Same as --world (deprecated)"));
allowed_options.insert("world", ValueSpec(VALUETYPE_STRING,
"Set world path (implies local game)"));
- allowed_options.insert("verbose", ValueSpec(VALUETYPE_FLAG,
+ allowed_options.insert("worldname", ValueSpec(VALUETYPE_STRING,
+ "Set world by name (implies local game)"));
+ allowed_options.insert("info", ValueSpec(VALUETYPE_FLAG,
"Print more information to console"));
+ allowed_options.insert("verbose", ValueSpec(VALUETYPE_FLAG,
+ "Print even more information to console"));
+ allowed_options.insert("trace", ValueSpec(VALUETYPE_FLAG,
+ "Print enormous amounts of information to log and console"));
allowed_options.insert("logfile", ValueSpec(VALUETYPE_STRING,
"Set logfile path ('' = no logging)"));
allowed_options.insert("gameid", ValueSpec(VALUETYPE_STRING,
Low-level initialization
*/
+ // If trace is enabled, enable logging of certain things
+ if(cmd_args.getFlag("trace")){
+ dstream<<"Enabling trace level debug output"<<std::endl;
+ dout_con_ptr = &verbosestream;
+ socket_enable_debug_output = true;
+ }
// In certain cases, output info level on stderr
- if(cmd_args.getFlag("verbose") || cmd_args.getFlag("speedtests"))
+ if(cmd_args.getFlag("info") || cmd_args.getFlag("verbose") ||
+ cmd_args.getFlag("trace") || cmd_args.getFlag("speedtests"))
log_add_output(&main_stderr_log_out, LMT_INFO);
+ // In certain cases, output verbose level on stderr
+ if(cmd_args.getFlag("verbose") || cmd_args.getFlag("trace"))
+ log_add_output(&main_stderr_log_out, LMT_VERBOSE);
porting::signal_handler_init();
bool &kill = *porting::signal_handler_killstatus();
}
// Print startup message
-
actionstream<<PROJECT_NAME<<
+
infostream<<PROJECT_NAME<<
" with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
<<", "<<BUILD_INFO
<<std::endl;
commanded_world = cmd_args.get("world");
else if(cmd_args.exists("map-dir"))
commanded_world = cmd_args.get("map-dir");
- else if(cmd_args.exists("nonopt0"))
+ else if(cmd_args.exists("nonopt0")) // First nameless argument
commanded_world = cmd_args.get("nonopt0");
else if(g_settings->exists("map-dir"))
commanded_world = g_settings->get("map-dir");
+ // World name
+ std::string commanded_worldname = "";
+ if(cmd_args.exists("worldname"))
+ commanded_worldname = cmd_args.get("worldname");
+
// Strip world.mt from commanded_world
{
std::string worldmt = "world.mt";
// World directory
std::string world_path;
+ verbosestream<<"Determining world path"<<std::endl;
bool is_legacy_world = false;
+ // If a world was commanded, use it
if(commanded_world != ""){
world_path = commanded_world;
+ infostream<<"Using commanded world path ["<<world_path<<"]"
+ <<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;
+ }
}
- else{
- // No specific world was commanded
- // Check if the world is found from the default directory, and if
- // not, see if the legacy world directory exists.
- world_path = porting::path_user + DIR_DELIM + "server" + DIR_DELIM + "worlds" + DIR_DELIM + "world";
- std::string legacy_world_path = porting::path_user+DIR_DELIM+".."+DIR_DELIM+"world";
- if(!fs::PathExists(world_path) && fs::PathExists(legacy_world_path)){
- errorstream<<"Warning: Using legacy world directory \""
- <<legacy_world_path<<"\""<<std::endl;
- world_path = legacy_world_path;
- is_legacy_world = true;
+ // No world was specified; try to select it automatically
+ else
+ {
+ // Get information about available worlds
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+ // If a world name was specified, select it
+ if(commanded_worldname != ""){
+ 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;
+ }
+ }
+ // If there is only a single world, use it
+ if(worldspecs.size() == 1){
+ world_path = worldspecs[0].path;
+ dstream<<"Automatically selecting world at ["
+ <<world_path<<"]"<<std::endl;
+ // If there are multiple worlds, list them
+ } else if(worldspecs.size() > 1){
+ dstream<<"Multiple worlds are available."<<std::endl;
+ dstream<<"Please select one using --worldname <name>"
+ <<" or --world <path>"<<std::endl;
+ print_worldspecs(worldspecs, dstream);
+ return 1;
+ // If there are no worlds, automatically create a new one
+ } else {
+ // This is the ultimate default world path
+ world_path = porting::path_user + DIR_DELIM + "worlds" +
+ DIR_DELIM + "world";
+ infostream<<"Creating default world at ["
+ <<world_path<<"]"<<std::endl;
}
}
- // Gamespec
- std::string world_gameid = getWorldGameId(world_path, is_legacy_world);
- SubgameSpec gamespec = findSubgame(world_gameid);
- if(commanded_gamespec.isValid() &&
- commanded_gamespec.id != world_gameid){
- errorstream<<"WARNING: Overriding gameid from \""
- <<world_gameid<<"\" to \""
- <<commanded_gamespec.id<<"\""<<std::endl;
- gamespec = commanded_gamespec;
+ if(world_path == ""){
+ errorstream<<"No world path specified or found."<<std::endl;
+ return 1;
}
+ verbosestream<<"Using world path ["<<world_path<<"]"<<std::endl;
+ // We need a gameid.
+ std::string gameid;
+ verbosestream<<"Determining gameid"<<std::endl;
+ // If world doesn't exist
+ if(!getWorldExists(world_path))
+ {
+ // Try to take gamespec from command line
+ if(commanded_gamespec.isValid()){
+ gameid = commanded_gamespec.id;
+ infostream<<"Using commanded gameid ["<<gameid<<"]"<<std::endl;
+ }
+ // Otherwise we will be using "minetest"
+ else{
+ gameid = g_settings->get("default_game");
+ infostream<<"Using default gameid ["<<gameid<<"]"<<std::endl;
+ }
+ }
+ // If world exists
+ else
+ {
+ // Otherwise read from the world
+ std::string world_gameid = getWorldGameId(world_path, is_legacy_world);
+ gameid = world_gameid;
+ if(commanded_gamespec.isValid() &&
+ commanded_gamespec.id != world_gameid){
+ gameid = commanded_gamespec.id;
+ errorstream<<"WARNING: Using commanded gameid ["<<gameid<<"]"
+ <<" instead of world gameid ["<<world_gameid
+ <<"]"<<std::endl;
+ } else{
+ infostream<<"Using world gameid ["<<gameid<<"]"<<std::endl;
+ }
+ }
+ verbosestream<<"Finding subgame ["<<gameid<<"]"<<std::endl;
+ SubgameSpec gamespec = findSubgame(gameid);
if(!gamespec.isValid()){
- errorstream<<"Invalid gamespec. (world_gameid="
- <<world_gameid<<")"<<std::endl;
+ errorstream<<"Subgame ["<<gameid<<"] could not be found."
+ <<std::endl;
return 1;
}
-
- infostream<<"Using gamespec \""<<gamespec.id<<"\""<<std::endl;
+ verbosestream<<"Using gameid ["<<gamespec.id<<"]"<<std::endl;
// Create server
- Server server(world_path, configpath, gamespec);
+ Server server(world_path, configpath, gamespec, false);
server.start(port);
// Run server
SubgameSpec gamespec;
WorldSpec worldspec;
+ bool simple_singleplayer_mode = false;
+
+ // These are set up based on the menu and other things
+ std::string current_playername = "inv£lid";
+ std::string current_password = "";
+ std::string current_address = "does-not-exist";
+ int current_port = 0;
/*
Out-of-game menu loop.
// Initialize menu data
MainMenuData menudata;
+ if(g_settings->exists("selected_mainmenu_tab"))
+ menudata.selected_tab = g_settings->getS32("selected_mainmenu_tab");
menudata.address = narrow_to_wide(address);
menudata.name = narrow_to_wide(playername);
menudata.port = narrow_to_wide(itos(port));
if(skip_main_menu == false)
{
+ video::IVideoDriver* driver = device->getVideoDriver();
+
+ infostream<<"Waiting for other menus"<<std::endl;
+ while(device->run() && kill == false)
+ {
+ if(noMenuActive())
+ break;
+ driver->beginScene(true, true,
+ video::SColor(255,128,128,128));
+ drawMenuBackground(driver);
+ guienv->drawAll();
+ driver->endScene();
+ // On some computers framerate doesn't seem to be
+ // automatically limited
+ sleep_ms(25);
+ }
+ infostream<<"Waited for other menus"<<std::endl;
+
GUIMainMenu *menu =
new GUIMainMenu(guienv, guiroot, -1,
&g_menumgr, &menudata, g_gamecallback);
error_message = L"";
}
- video::IVideoDriver* driver = device->getVideoDriver();
-
infostream<<"Created main menu"<<std::endl;
while(device->run() && kill == false)
sleep_ms(25);
}
- // Break out of menu-game loop to shut down cleanly
- if(device->run() == false || kill == true)
- break;
-
infostream<<"Dropping main menu"<<std::endl;
menu->drop();
}
+ playername = wide_to_narrow(menudata.name);
+ password = translatePassword(playername, menudata.password);
+ //infostream<<"Main: password hash: '"<<password<<"'"<<std::endl;
+
+ address = wide_to_narrow(menudata.address);
+ int newport = stoi(wide_to_narrow(menudata.port));
+ if(newport != 0)
+ port = newport;
+ simple_singleplayer_mode = menudata.simple_singleplayer_mode;
+ // Save settings
+ g_settings->setS32("selected_mainmenu_tab", menudata.selected_tab);
+ g_settings->set("new_style_leaves", itos(menudata.fancy_trees));
+ g_settings->set("smooth_lighting", itos(menudata.smooth_lighting));
+ g_settings->set("enable_3d_clouds", itos(menudata.clouds_3d));
+ g_settings->set("opaque_water", itos(menudata.opaque_water));
+ g_settings->set("creative_mode", itos(menudata.creative_mode));
+ g_settings->set("enable_damage", itos(menudata.enable_damage));
+ g_settings->set("name", playername);
+ g_settings->set("address", address);
+ g_settings->set("port", itos(port));
+ if(menudata.selected_world != -1)
+ g_settings->set("selected_world_path",
+ worldspecs[menudata.selected_world].path);
+
+ // Break out of menu-game loop to shut down cleanly
+ if(device->run() == false || kill == true)
+ break;
+
+ current_playername = playername;
+ current_password = password;
+ current_address = address;
+ current_port = port;
+
+ // If using simple singleplayer mode, override
+ if(simple_singleplayer_mode){
+ current_playername = "singleplayer";
+ current_password = "";
+ current_address = "";
+ current_port = 30011;
+ }
+
// Set world path to selected one
if(menudata.selected_world != -1){
worldspec = worldspecs[menudata.selected_world];
infostream<<"Selected world: "<<worldspec.name
<<" ["<<worldspec.path<<"]"<<std::endl;
}
-
- // Delete world if requested
- if(menudata.delete_world_spec.isValid())
- {
- bool r = fs::RecursiveDeleteContent(
- menudata.delete_world_spec.path);
- if(r == false){
- error_message = L"World delete failed";
- errorstream<<wide_to_narrow(error_message)<<std::endl;
- }
+
+ // Only refresh if so requested
+ if(menudata.only_refresh){
+ infostream<<"Refreshing menu"<<std::endl;
continue;
}
-
+
// Create new world if requested
if(menudata.create_world_name != L"")
{
std::string path = porting::path_user + DIR_DELIM
- + "server" + DIR_DELIM + "worlds" + DIR_DELIM
+ "worlds" + DIR_DELIM
+ wide_to_narrow(menudata.create_world_name);
// Create world if it doesn't exist
if(!initializeWorld(path, menudata.create_world_gameid)){
continue;
}
- playername = wide_to_narrow(menudata.name);
- password = translatePassword(playername, menudata.password);
- //infostream<<"Main: password hash: '"<<password<<"'"<<std::endl;
-
- address = wide_to_narrow(menudata.address);
- int newport = stoi(wide_to_narrow(menudata.port));
- if(newport != 0)
- port = newport;
- // Save settings
- g_settings->set("new_style_leaves", itos(menudata.fancy_trees));
- g_settings->set("smooth_lighting", itos(menudata.smooth_lighting));
- g_settings->set("enable_3d_clouds", itos(menudata.clouds_3d));
- g_settings->set("opaque_water", itos(menudata.opaque_water));
- g_settings->set("creative_mode", itos(menudata.creative_mode));
- g_settings->set("enable_damage", itos(menudata.enable_damage));
- g_settings->set("name", playername);
- g_settings->set("address", address);
- g_settings->set("port", itos(port));
- if(menudata.selected_world != -1)
- g_settings->set("selected_world_path",
- worldspecs[menudata.selected_world].path);
- // Update configuration file
- if(configpath != "")
- g_settings->updateConfigFile(configpath.c_str());
-
// If local game
- if(address == "")
+ if(current_address == "")
{
if(menudata.selected_world == -1){
error_message = L"No world selected and no address "
// Break out of menu-game loop to shut down cleanly
if(device->run() == false || kill == true)
break;
-
+
/*
Run game
*/
device,
font,
worldspec.path,
- playername,
- password,
- address,
- port,
+ current_playername,
+ current_password,
+ current_address,
+ current_port,
error_message,
configpath,
chat_backend,
- gamespec
+ gamespec,
+ simple_singleplayer_mode
);
} //try
projects / oweals / minetest.git / blobdiff