/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <iostream>
#include <fstream>
#include <locale.h>
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
#include "debug.h"
#include "test.h"
#include "server.h"
#include "profiler.h"
#include "log.h"
#include "mods.h"
-#include "utility_string.h"
+#if USE_FREETYPE
+#include "xCGUITTFont.h"
+#endif
+#include "util/string.h"
#include "subgame.h"
+#include "quicktune.h"
+#include "serverlist.h"
/*
Settings.
// 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;
log_register_thread("main");
- // Set locale. This is for forcing '.' as the decimal point.
- std::locale::global(std::locale("C"));
- // This enables printing all characters in bitmap font
- setlocale(LC_CTYPE, "en_US");
+ // This enables internatonal characters input
+ if( setlocale(LC_ALL, "") == NULL )
+ {
+ fprintf( stderr, "%s: warning: could not set default locale\n", argv[0] );
+ }
+ // Set locale. This is for forcing '.' as the decimal point.
+ try {
+ std::locale::global(std::locale(std::locale(""), "C", std::locale::numeric));
+ setlocale(LC_NUMERIC, "C");
+ } catch (const std::exception& ex) {
+ errorstream<<"Could not set numeric locale to C"<<std::endl;
+ }
/*
Parse command line
*/
// List all allowed options
core::map<std::string, ValueSpec> allowed_options;
allowed_options.insert("help", ValueSpec(VALUETYPE_FLAG,
- "Show allowed options"));
+ _("Show allowed options")));
allowed_options.insert("config", ValueSpec(VALUETYPE_STRING,
- "Load configuration from specified file"));
+ _("Load configuration from specified file")));
allowed_options.insert("port", ValueSpec(VALUETYPE_STRING,
- "Set network port (UDP)"));
+ _("Set network port (UDP)")));
allowed_options.insert("disable-unittests", ValueSpec(VALUETYPE_FLAG,
- "Disable unit tests"));
+ _("Disable unit tests")));
allowed_options.insert("enable-unittests", ValueSpec(VALUETYPE_FLAG,
- "Enable unit tests"));
+ _("Enable unit tests")));
allowed_options.insert("map-dir", ValueSpec(VALUETYPE_STRING,
- "Same as --world (deprecated)"));
+ _("Same as --world (deprecated)")));
allowed_options.insert("world", ValueSpec(VALUETYPE_STRING,
- "Set world path"));
+ _("Set world path (implies local game) ('list' lists all)")));
+ 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 more information to console"));
+ _("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)"));
+ _("Set logfile path ('' = no logging)")));
allowed_options.insert("gameid", ValueSpec(VALUETYPE_STRING,
- "Set gameid (\"--gameid list\" prints available ones)"));
+ _("Set gameid (\"--gameid list\" prints available ones)")));
#ifndef SERVER
allowed_options.insert("speedtests", ValueSpec(VALUETYPE_FLAG,
- "Run speed tests"));
+ _("Run speed tests")));
allowed_options.insert("address", ValueSpec(VALUETYPE_STRING,
- "Address to connect to. ('' = local game)"));
+ _("Address to connect to. ('' = local game)")));
allowed_options.insert("random-input", ValueSpec(VALUETYPE_FLAG,
- "Enable random user input, for testing"));
+ _("Enable random user input, for testing")));
allowed_options.insert("server", ValueSpec(VALUETYPE_FLAG,
- "Run dedicated server"));
+ _("Run dedicated server")));
allowed_options.insert("name", ValueSpec(VALUETYPE_STRING,
- "Set player name"));
+ _("Set player name")));
allowed_options.insert("password", ValueSpec(VALUETYPE_STRING,
- "Set password"));
+ _("Set password")));
allowed_options.insert("go", ValueSpec(VALUETYPE_FLAG,
- "Disable main menu"));
+ _("Disable main menu")));
#endif
Settings cmd_args;
bool ret = cmd_args.parseCommandLine(argc, argv, allowed_options);
- if(ret == false || cmd_args.getFlag("help"))
+ if(ret == false || cmd_args.getFlag("help") || cmd_args.exists("nonopt1"))
{
- dstream<<"Allowed options:"<<std::endl;
+ dstream<<_("Allowed options:")<<std::endl;
for(core::map<std::string, ValueSpec>::Iterator
i = allowed_options.getIterator();
i.atEnd() == false; i++)
if(i.getNode()->getValue().type == VALUETYPE_FLAG)
{}
else
- os1<<" <value>";
+ os1<<_(" <value>");
dstream<<padStringRight(os1.str(), 24);
if(i.getNode()->getValue().help != NULL)
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;
+ log_trace_level_enabled = true;
+ dout_con_ptr = &verbosestream; // this is somewhat old crap
+ socket_enable_debug_output = true; // socket doesn't use log.h
+ }
// 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();
// Create user data directory
fs::CreateDir(porting::path_user);
- init_gettext((porting::path_share+DIR_DELIM+".."+DIR_DELIM+"locale").c_str());
-
- // Initialize debug streams
-#ifdef RUN_IN_PLACE
- std::string logfile = DEBUGFILE;
-#else
- std::string logfile = porting::path_user+DIR_DELIM+DEBUGFILE;
-#endif
- if(cmd_args.exists("logfile"))
- logfile = cmd_args.get("logfile");
- if(logfile != "")
- debugstreams_init(false, logfile.c_str());
- else
- debugstreams_init(false, NULL);
+ init_gettext((porting::path_share + DIR_DELIM + "locale").c_str());
- infostream<<"logfile = "<<logfile<<std::endl;
infostream<<"path_share = "<<porting::path_share<<std::endl;
infostream<<"path_user = "<<porting::path_user<<std::endl;
return 0;
}
+ // List worlds if requested
+ if(cmd_args.exists("world") && cmd_args.get("world") == "list"){
+ dstream<<_("Available worlds:")<<std::endl;
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+ print_worldspecs(worldspecs, dstream);
+ return 0;
+ }
+
// Print startup message
-
actionstream<<PROJECT_NAME<<
- " with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
+
infostream<<PROJECT_NAME<<
+ " "<<_("with")<<" SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
<<", "<<BUILD_INFO
<<std::endl;
// Legacy configuration file location
filenames.push_back(porting::path_user +
DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
-#ifdef RUN_IN_PLACE
+#if RUN_IN_PLACE
// Try also from a lower level (to aid having the same configuration
// for many RUN_IN_PLACE installs)
filenames.push_back(porting::path_user +
if(configpath == "")
configpath = filenames[0];
}
+
+ // Initialize debug streams
+#define DEBUGFILE "debug.txt"
+#if RUN_IN_PLACE
+ std::string logfile = DEBUGFILE;
+#else
+ std::string logfile = porting::path_user+DIR_DELIM+DEBUGFILE;
+#endif
+ if(cmd_args.exists("logfile"))
+ logfile = cmd_args.get("logfile");
+
+ log_remove_output(&main_dstream_no_stderr_log_out);
+ int loglevel = g_settings->getS32("debug_log_level");
+
+ if (loglevel == 0) //no logging
+ logfile = "";
+ else if (loglevel > 0 && loglevel <= LMT_NUM_VALUES)
+ log_add_output_maxlev(&main_dstream_no_stderr_log_out, (LogMessageLevel)(loglevel - 1));
+
+ if(logfile != "")
+ debugstreams_init(false, logfile.c_str());
+ else
+ debugstreams_init(false, NULL);
+
+ infostream<<"logfile = "<<logfile<<std::endl;
// Initialize random seed
srand(time(0));
if(port == 0)
port = 30000;
- // Map directory
- std::string world_path = porting::path_user + DIR_DELIM + "server" + DIR_DELIM + "worlds" + DIR_DELIM + "world";
+ // World directory
+ std::string commanded_world = "";
if(cmd_args.exists("world"))
- world_path = cmd_args.get("world");
+ commanded_world = cmd_args.get("world");
else if(cmd_args.exists("map-dir"))
- world_path = cmd_args.get("map-dir");
+ commanded_world = cmd_args.get("map-dir");
+ else if(cmd_args.exists("nonopt0")) // First nameless argument
+ commanded_world = cmd_args.get("nonopt0");
else if(g_settings->exists("map-dir"))
- world_path = g_settings->get("map-dir");
- else{
- // No map-dir option was specified.
- // Check if the world is found from the default directory, and if
- // not, see if the legacy world directory exists.
- 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;
+ 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";
+ if(commanded_world.size() > worldmt.size() &&
+ commanded_world.substr(commanded_world.size()-worldmt.size())
+ == worldmt){
+ dstream<<_("Supplied world.mt file - stripping it off.")<<std::endl;
+ commanded_world = commanded_world.substr(
+ 0, commanded_world.size()-worldmt.size());
}
}
- // Determine gameid
- std::string gameid = "";
- if(cmd_args.exists("gameid"))
- gameid = cmd_args.get("gameid");
- std::string world_gameid = getWorldGameId(world_path);
- if(world_gameid == ""){
- if(gameid != "")
- world_gameid = gameid;
- else{
- world_gameid = "mesetint";
+ // 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(gameid == "")
- gameid = world_gameid;
- else if(world_gameid != ""){
- if(world_gameid != gameid){
- errorstream<<"World gameid mismatch"<<std::endl;
+ if(!found){
+ dstream<<_("World")<<" '"<<commanded_worldname<<_("' not "
+ "available. Available worlds:")<<std::endl;
+ print_worldspecs(worldspecs, dstream);
return 1;
}
}
- if(gameid == ""){
- errorstream<<"No gameid supplied or detected"<<std::endl;
- return 1;
- }
-
- infostream<<"Using gameid \""<<gameid<<"\""<<std::endl;
- SubgameSpec gamespec = findSubgame(gameid);
- if(!gamespec.isValid()){
- errorstream<<"Game \""<<gameid<<"\" not found"<<std::endl;
- return 1;
+ // Gamespec
+ SubgameSpec commanded_gamespec;
+ if(cmd_args.exists("gameid")){
+ std::string gameid = cmd_args.get("gameid");
+ commanded_gamespec = findSubgame(gameid);
+ if(!commanded_gamespec.isValid()){
+ errorstream<<"Game \""<<gameid<<"\" not found"<<std::endl;
+ return 1;
+ }
}
- // Run dedicated server if asked to or no other option
+ /*
+ Run dedicated server if asked to or no other option
+ */
#ifdef SERVER
bool run_dedicated_server = true;
#else
bool run_dedicated_server = cmd_args.getFlag("server");
#endif
+ g_settings->set("server_dedicated", run_dedicated_server ? "true" : "false");
if(run_dedicated_server)
{
DSTACK("Dedicated server branch");
-
// Create time getter if built with Irrlicht
#ifndef SERVER
g_timegetter = new SimpleTimeGetter();
#endif
-
+
+ // 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;
+ }
+ // 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;
+ }
+ }
+
+ 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 gamespec.
+ SubgameSpec gamespec;
+ verbosestream<<_("Determining gameid/gamespec")<<std::endl;
+ // If world doesn't exist
+ if(!getWorldExists(world_path))
+ {
+ // Try to take gamespec from command line
+ if(commanded_gamespec.isValid()){
+ gamespec = commanded_gamespec;
+ infostream<<"Using commanded gameid ["<<gamespec.id<<"]"<<std::endl;
+ }
+ // Otherwise we will be using "minetest"
+ else{
+ gamespec = findSubgame(g_settings->get("default_game"));
+ infostream<<"Using default gameid ["<<gamespec.id<<"]"<<std::endl;
+ }
+ }
+ // World exists
+ else
+ {
+ std::string world_gameid = getWorldGameId(world_path, is_legacy_world);
+ // If commanded to use a gameid, do so
+ if(commanded_gamespec.isValid()){
+ gamespec = commanded_gamespec;
+ if(commanded_gamespec.id != world_gameid){
+ errorstream<<"WARNING: Using commanded gameid ["
+ <<gamespec.id<<"]"<<" instead of world gameid ["
+ <<world_gameid<<"]"<<std::endl;
+ }
+ } else{
+ // If world contains an embedded game, use it;
+ // Otherwise find world from local system.
+ gamespec = findWorldSubgame(world_path);
+ infostream<<"Using world gameid ["<<gamespec.id<<"]"<<std::endl;
+ }
+ }
+ if(!gamespec.isValid()){
+ errorstream<<"Subgame ["<<gamespec.id<<"] could not be found."
+ <<std::endl;
+ return 1;
+ }
+ 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
*/
std::string address = g_settings->get("address");
- if(cmd_args.exists("address"))
+ if(commanded_world != "")
+ address = "";
+ else if(cmd_args.exists("address"))
address = cmd_args.get("address");
std::string playername = g_settings->get("name");
// Resolution selection
- bool fullscreen = false;
+ bool fullscreen = g_settings->getBool("fullscreen");
u16 screenW = g_settings->getU16("screenW");
u16 screenH = g_settings->getU16("screenH");
+ // bpp, fsaa, vsync
+
+ bool vsync = g_settings->getBool("vsync");
+ u16 bits = g_settings->getU16("fullscreen_bpp");
+ u16 fsaa = g_settings->getU16("fsaa");
+
// Determine driver
video::E_DRIVER_TYPE driverType;
MyEventReceiver receiver;
IrrlichtDevice *device;
- device = createDevice(driverType,
- core::dimension2d<u32>(screenW, screenH),
- 16, fullscreen, false, false, &receiver);
+
+ SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
+ params.DriverType = driverType;
+ params.WindowSize = core::dimension2d<u32>(screenW, screenH);
+ params.Bits = bits;
+ params.AntiAlias = fsaa;
+ params.Fullscreen = fullscreen;
+ params.Stencilbuffer = false;
+ params.Vsync = vsync;
+ params.EventReceiver = &receiver;
+
+ device = createDeviceEx(params);
if (device == 0)
return 1; // could not create selected driver.
video::IVideoDriver* driver = device->getVideoDriver();
- // Disable mipmaps (because some of them look ugly)
- driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
-
/*
This changes the minimum allowed number of vertices in a VBO.
Default is 500.
guienv = device->getGUIEnvironment();
gui::IGUISkin* skin = guienv->getSkin();
+ #if USE_FREETYPE
+ std::string font_path = g_settings->get("font_path");
+ u16 font_size = g_settings->getU16("font_size");
+ gui::IGUIFont *font = gui::CGUITTFont::createTTFont(guienv, font_path.c_str(), font_size);
+ #else
gui::IGUIFont* font = guienv->getFont(getTexturePath("fontlucida.png").c_str());
+ #endif
if(font)
skin->setFont(font);
else
//skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(0,0,0,0));
skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255,0,0,0));
skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255,0,0,0));
-
+ skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255,70,100,50));
+ skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255,255,255,255));
+
+#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
+ // Irrlicht 1.8 input colours
+ skin->setColor(gui::EGDC_EDITABLE, video::SColor(255,128,128,128));
+ skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255,96,134,49));
+#endif
+
/*
GUI stuff
*/
// The password entered during the menu screen,
std::string password;
+ bool first_loop = true;
+
/*
Menu-game loop
*/
while(device->run() && kill == false)
{
// Set the window caption
- device->setWindowCaption(L"Minetest [Main Menu]");
+ device->setWindowCaption((std::wstring(L"Minetest [")+wgettext("Main Menu")+L"]").c_str());
// This is used for catching disconnects
try
guiroot = guienv->addStaticText(L"",
core::rect<s32>(0, 0, 10000, 10000));
+ 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.
*/
while(kill == false)
{
+ // If skip_main_menu, only go through here once
+ if(skip_main_menu && !first_loop){
+ kill = true;
+ break;
+ }
+ first_loop = false;
+
// Cursor can be non-visible when coming from the game
device->getCursorControl()->setVisible(true);
// Some stuff are left to scene manager when coming from the game
// (map at least?)
smgr->clear();
- // Reset or hide the debug gui texts
- /*guitext->setText(L"Minetest-c55");
- guitext2->setVisible(false);
- guitext_info->setVisible(false);
- guitext_chat->setVisible(false);*/
// 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(cmd_args.exists("password"))
+ menudata.password = narrow_to_wide(cmd_args.get("password"));
menudata.fancy_trees = g_settings->getBool("new_style_leaves");
menudata.smooth_lighting = g_settings->getBool("smooth_lighting");
menudata.clouds_3d = g_settings->getBool("enable_3d_clouds");
menudata.opaque_water = g_settings->getBool("opaque_water");
+ menudata.mip_map = g_settings->getBool("mip_map");
+ menudata.anisotropic_filter = g_settings->getBool("anisotropic_filter");
+ menudata.bilinear_filter = g_settings->getBool("bilinear_filter");
+ menudata.trilinear_filter = g_settings->getBool("trilinear_filter");
+ menudata.enable_shaders = g_settings->getS32("enable_shaders");
+ menudata.preload_item_visuals = g_settings->getBool("preload_item_visuals");
+ menudata.enable_particles = g_settings->getBool("enable_particles");
+ driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, menudata.mip_map);
menudata.creative_mode = g_settings->getBool("creative_mode");
menudata.enable_damage = g_settings->getBool("enable_damage");
- if(cmd_args.exists("password"))
- menudata.password = narrow_to_wide(cmd_args.get("password"));
+ menudata.enable_public = g_settings->getBool("server_announce");
+ // Default to selecting nothing
+ menudata.selected_world = -1;
+ // Get world listing for the menu
+ std::vector<WorldSpec> worldspecs = getAvailableWorlds();
+ // If there is only one world, select it
+ if(worldspecs.size() == 1){
+ menudata.selected_world = 0;
+ }
+ // Otherwise try to select according to selected_world_path
+ else if(g_settings->exists("selected_world_path")){
+ std::string trypath = g_settings->get("selected_world_path");
+ for(u32 i=0; i<worldspecs.size(); i++){
+ if(worldspecs[i].path == trypath){
+ menudata.selected_world = i;
+ break;
+ }
+ }
+ }
+ // If a world was commanded, append and select it
+ if(commanded_world != ""){
+ std::string gameid = getWorldGameId(commanded_world, true);
+ std::string name = _("[--world parameter]");
+ if(gameid == ""){
+ gameid = g_settings->get("default_game");
+ name += " [new]";
+ }
+ WorldSpec spec(commanded_world, name, gameid);
+ worldspecs.push_back(spec);
+ menudata.selected_world = worldspecs.size()-1;
+ }
+ // Copy worldspecs to menu
+ menudata.worlds = worldspecs;
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();
-
- // Delete map if requested
- if(menudata.delete_map)
- {
- bool r = fs::RecursiveDeleteContent(world_path);
- if(r == false)
- error_message = L"Delete failed";
- continue;
- }
}
playername = wide_to_narrow(menudata.name);
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("mip_map", itos(menudata.mip_map));
+ g_settings->set("anisotropic_filter", itos(menudata.anisotropic_filter));
+ g_settings->set("bilinear_filter", itos(menudata.bilinear_filter));
+ g_settings->set("trilinear_filter", itos(menudata.trilinear_filter));
+
+ g_settings->setS32("enable_shaders", menudata.enable_shaders);
+ g_settings->set("preload_item_visuals", itos(menudata.preload_item_visuals));
+ g_settings->set("enable_particles", itos(menudata.enable_particles));
+
g_settings->set("creative_mode", itos(menudata.creative_mode));
g_settings->set("enable_damage", itos(menudata.enable_damage));
+ g_settings->set("server_announce", itos(menudata.enable_public));
g_settings->set("name", playername);
g_settings->set("address", address);
g_settings->set("port", itos(port));
- // Update configuration file
- if(configpath != "")
- g_settings->updateConfigFile(configpath.c_str());
-
+ 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;
+ }
+ else if (address != "")
+ {
+ ServerListSpec server;
+ server["name"] = menudata.servername;
+ server["address"] = wide_to_narrow(menudata.address);
+ server["port"] = wide_to_narrow(menudata.port);
+ server["description"] = menudata.serverdescription;
+ ServerList::insert(server);
+ }
+
+ // 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;
+ }
+
+ // 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
+ "worlds" + DIR_DELIM
+ + wide_to_narrow(menudata.create_world_name);
+ // Create world if it doesn't exist
+ if(!initializeWorld(path, menudata.create_world_gameid)){
+ error_message = wgettext("Failed to initialize world");
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
+ continue;
+ }
+ g_settings->set("selected_world_path", path);
+ continue;
+ }
+
+ // If local game
+ if(current_address == "")
+ {
+ if(menudata.selected_world == -1){
+ error_message = wgettext("No world selected and no address "
+ "provided. Nothing to do.");
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
+ continue;
+ }
+ // Load gamespec for required game
+ gamespec = findWorldSubgame(worldspec.path);
+ if(!gamespec.isValid() && !commanded_gamespec.isValid()){
+ error_message = wgettext("Could not find or load game \"")
+ + narrow_to_wide(worldspec.gameid) + L"\"";
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
+ continue;
+ }
+ if(commanded_gamespec.isValid() &&
+ commanded_gamespec.id != worldspec.gameid){
+ errorstream<<"WARNING: Overriding gamespec from \""
+ <<worldspec.gameid<<"\" to \""
+ <<commanded_gamespec.id<<"\""<<std::endl;
+ gamespec = commanded_gamespec;
+ }
+
+ if(!gamespec.isValid()){
+ error_message = wgettext("Invalid gamespec.");
+ error_message += L" (world_gameid="
+ +narrow_to_wide(worldspec.gameid)+L")";
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
+ continue;
+ }
+ }
+
// Continue to game
break;
}
// Break out of menu-game loop to shut down cleanly
if(device->run() == false || kill == true)
break;
-
+
/*
Run game
*/
input,
device,
font,
- world_path,
- playername,
- password,
- address,
- port,
+ worldspec.path,
+ current_playername,
+ current_password,
+ current_address,
+ current_port,
error_message,
configpath,
chat_backend,
- gamespec
+ gamespec,
+ simple_singleplayer_mode
);
} //try
catch(con::PeerNotFoundException &e)
{
- errorstream<<"Connection error (timed out?)"<<std::endl;
- error_message = L"Connection error (timed out?)";
+ error_message = wgettext("Connection error (timed out?)");
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
}
- catch(SocketException &e)
+ catch(ServerError &e)
{
- errorstream<<"Socket error (port already in use?)"<<std::endl;
- error_message = L"Socket error (port already in use?)";
+ error_message = narrow_to_wide(e.what());
+ errorstream<<wide_to_narrow(error_message)<<std::endl;
}
catch(ModError &e)
{
errorstream<<e.what()<<std::endl;
- error_message = narrow_to_wide(e.what()) + L"\nCheck debug.txt for details.";
+ error_message = narrow_to_wide(e.what()) + wgettext("\nCheck debug.txt for details.");
}
#ifdef NDEBUG
catch(std::exception &e)
{
- std::string narrow_message = "Some exception, what()=\"";
+ std::string narrow_message = "Some exception: \"";
narrow_message += e.what();
narrow_message += "\"";
errorstream<<narrow_message<<std::endl;
// Update configuration file
if(configpath != "")
g_settings->updateConfigFile(configpath.c_str());
+
+ // Print modified quicktune values
+ {
+ bool header_printed = false;
+ std::vector<std::string> names = getQuicktuneNames();
+ for(u32 i=0; i<names.size(); i++){
+ QuicktuneValue val = getQuicktuneValue(names[i]);
+ if(!val.modified)
+ continue;
+ if(!header_printed){
+ dstream<<"Modified quicktune values:"<<std::endl;
+ header_printed = true;
+ }
+ dstream<<names[i]<<" = "<<val.getString()<<std::endl;
+ }
+ }
END_DEBUG_EXCEPTION_HANDLER(errorstream)
projects / dragonfireclient.git / blobdiff