/*
-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 "clouds.h"
#include "server.h"
#include "constants.h"
#include "porting.h"
#include "guiMessageMenu.h"
#include "filesys.h"
#include "config.h"
+#include "version.h"
#include "guiMainMenu.h"
#include "game.h"
#include "keycode.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"
+#include "guiEngine.h"
+#include "mapsector.h"
+
+#include "database-sqlite3.h"
+#ifdef USE_LEVELDB
+#include "database-leveldb.h"
+#endif
+
+#if USE_CURL
+#include "curl/curl.h"
+#endif
/*
Settings.
*/
Settings main_settings;
Settings *g_settings = &main_settings;
+std::string g_settings_path;
// Global profiler
Profiler main_profiler;
Profiler *g_profiler = &main_profiler;
+// Menu clouds are created later
+Clouds *g_menuclouds = 0;
+irr::scene::ISceneManager *g_menucloudsmgr = 0;
+
/*
Debug streams
*/
// 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;
u32 getTimeMs()
{
/* Use imprecise system calls directly (from porting.h) */
- return porting::getTimeMs();
+ return porting::getTime(PRECISION_MILLI);
+}
+
+u32 getTime(TimePrecision prec)
+{
+ return porting::getTime(prec);
}
#else
class TimeGetter
{
public:
- virtual u32 getTime() = 0;
+ virtual u32 getTime(TimePrecision prec) = 0;
};
// A precise irrlicht one
IrrlichtTimeGetter(IrrlichtDevice *device):
m_device(device)
{}
- u32 getTime()
+ u32 getTime(TimePrecision prec)
{
- if(m_device == NULL)
- return 0;
- return m_device->getTimer()->getRealTime();
+ if (prec == PRECISION_MILLI) {
+ if(m_device == NULL)
+ return 0;
+ return m_device->getTimer()->getRealTime();
+ } else {
+ return porting::getTime(prec);
+ }
}
private:
IrrlichtDevice *m_device;
class SimpleTimeGetter: public TimeGetter
{
public:
- u32 getTime()
+ u32 getTime(TimePrecision prec)
{
- return porting::getTimeMs();
+ return porting::getTime(prec);
}
};
{
if(g_timegetter == NULL)
return 0;
- return g_timegetter->getTime();
+ return g_timegetter->getTime(PRECISION_MILLI);
}
+u32 getTime(TimePrecision prec) {
+ if (g_timegetter == NULL)
+ return 0;
+ return g_timegetter->getTime(prec);
+}
#endif
class StderrLogOutput: public ILogOutput
*/
if(noMenuActive() == false)
{
- return false;
+ return g_menumgr.preprocessEvent(event);
}
// Remember whether each key is down or up
{
return keyIsDown[keyCode];
}
-
+
// Checks whether a key was down and resets the state
bool WasKeyDown(const KeyPress &keyCode)
{
private:
IrrlichtDevice *m_device;
-
+
// The current state of keys
KeyList keyIsDown;
// Whether a key has been pressed or not
{
return m_receiver->right_active;
}
-
+
virtual bool getLeftClicked()
{
return m_receiver->leftclicked;
bool rightreleased;
};
-void drawMenuBackground(video::IVideoDriver* driver)
-{
- core::dimension2d<u32> screensize = driver->getScreenSize();
-
- video::ITexture *bgtexture =
- driver->getTexture(getTexturePath("menubg.png").c_str());
- if(bgtexture)
- {
- s32 scaledsize = 128;
-
- // The important difference between destsize and screensize is
- // that destsize is rounded to whole scaled pixels.
- // These formulas use component-wise multiplication and division of v2u32.
- v2u32 texturesize = bgtexture->getSize();
- v2u32 sourcesize = texturesize * screensize / scaledsize + v2u32(1,1);
- v2u32 destsize = scaledsize * sourcesize / texturesize;
-
- // Default texture wrapping mode in Irrlicht is ETC_REPEAT.
- driver->draw2DImage(bgtexture,
- core::rect<s32>(0, 0, destsize.X, destsize.Y),
- core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
- NULL, NULL, true);
- }
-
- video::ITexture *logotexture =
- driver->getTexture(getTexturePath("menulogo.png").c_str());
- if(logotexture)
- {
- v2s32 logosize(logotexture->getOriginalSize().Width,
- logotexture->getOriginalSize().Height);
- logosize *= 4;
-
- video::SColor bgcolor(255,50,50,50);
- core::rect<s32> bgrect(0, screensize.Height-logosize.Y-20,
- screensize.Width, screensize.Height);
- driver->draw2DRectangle(bgcolor, bgrect, NULL);
-
- core::rect<s32> rect(0,0,logosize.X,logosize.Y);
- rect += v2s32(screensize.Width/2,screensize.Height-10-logosize.Y);
- rect -= v2s32(logosize.X/2, 0);
- driver->draw2DImage(logotexture, rect,
- core::rect<s32>(core::position2d<s32>(0,0),
- core::dimension2di(logotexture->getSize())),
- NULL, NULL, true);
- }
-}
-
-#endif
+#endif // !SERVER
// These are defined global so that they're not optimized too much.
// Can't change them to volatile.
}
}
}
-
+
infostream<<"All of the following tests should take around 100ms each."
<<std::endl;
tempf += 0.001;
}
}
-
+
{
TimeTaker timer("Testing floating-point vector speed");
}
{
- TimeTaker timer("Testing core::map speed");
-
- core::map<v2s16, f32> map1;
+ TimeTaker timer("Testing std::map speed");
+
+ std::map<v2s16, f32> map1;
tempf = -324;
const s16 ii=300;
for(s16 y=0; y<ii; y++){
for(s16 x=0; x<ii; x++){
- map1.insert(v2s16(x,y), tempf);
+ map1[v2s16(x,y)] = tempf;
tempf += 1;
}
}
{
infostream<<"Around 5000/ms should do well here."<<std::endl;
TimeTaker timer("Testing mutex speed");
-
+
JMutex m;
- m.Init();
u32 n = 0;
u32 i = 0;
do{
}
}
// Do at least 10ms
- while(timer.getTime() < 10);
+ while(timer.getTimerTime() < 10);
u32 dtime = timer.stop();
u32 per_ms = n / dtime;
}
}
+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_add_output_all_levs(&main_dstream_no_stderr_log_out);
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");
-
/*
Parse command line
*/
-
+
// List all allowed options
- core::map<std::string, ValueSpec> allowed_options;
- allowed_options.insert("help", ValueSpec(VALUETYPE_FLAG,
- "Show allowed options"));
- allowed_options.insert("config", ValueSpec(VALUETYPE_STRING,
- "Load configuration from specified file"));
- allowed_options.insert("port", ValueSpec(VALUETYPE_STRING,
- "Set network port (UDP)"));
- allowed_options.insert("disable-unittests", ValueSpec(VALUETYPE_FLAG,
- "Disable unit tests"));
- allowed_options.insert("enable-unittests", ValueSpec(VALUETYPE_FLAG,
- "Enable unit tests"));
- allowed_options.insert("map-dir", ValueSpec(VALUETYPE_STRING,
- "Same as --world (deprecated)"));
- allowed_options.insert("world", ValueSpec(VALUETYPE_STRING,
- "Set world path (implies local game)"));
- allowed_options.insert("verbose", ValueSpec(VALUETYPE_FLAG,
- "Print more information to console"));
- allowed_options.insert("logfile", ValueSpec(VALUETYPE_STRING,
- "Set logfile path ('' = no logging)"));
- allowed_options.insert("gameid", ValueSpec(VALUETYPE_STRING,
- "Set gameid (\"--gameid list\" prints available ones)"));
+ std::map<std::string, ValueSpec> allowed_options;
+ allowed_options.insert(std::make_pair("help", ValueSpec(VALUETYPE_FLAG,
+ _("Show allowed options"))));
+ allowed_options.insert(std::make_pair("version", ValueSpec(VALUETYPE_FLAG,
+ _("Show version information"))));
+ allowed_options.insert(std::make_pair("config", ValueSpec(VALUETYPE_STRING,
+ _("Load configuration from specified file"))));
+ allowed_options.insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING,
+ _("Set network port (UDP)"))));
+ allowed_options.insert(std::make_pair("disable-unittests", ValueSpec(VALUETYPE_FLAG,
+ _("Disable unit tests"))));
+ allowed_options.insert(std::make_pair("enable-unittests", ValueSpec(VALUETYPE_FLAG,
+ _("Enable unit tests"))));
+ allowed_options.insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
+ _("Same as --world (deprecated)"))));
+ allowed_options.insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
+ _("Set world path (implies local game) ('list' lists all)"))));
+ allowed_options.insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING,
+ _("Set world by name (implies local game)"))));
+ allowed_options.insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG,
+ _("Print more information to console"))));
+ allowed_options.insert(std::make_pair("verbose", ValueSpec(VALUETYPE_FLAG,
+ _("Print even more information to console"))));
+ allowed_options.insert(std::make_pair("trace", ValueSpec(VALUETYPE_FLAG,
+ _("Print enormous amounts of information to log and console"))));
+ allowed_options.insert(std::make_pair("logfile", ValueSpec(VALUETYPE_STRING,
+ _("Set logfile path ('' = no logging)"))));
+ allowed_options.insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING,
+ _("Set gameid (\"--gameid list\" prints available ones)"))));
+ allowed_options.insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING,
+ _("Migrate from current map backend to another (Only works when using minetestserver or with --server)"))));
#ifndef SERVER
- allowed_options.insert("speedtests", ValueSpec(VALUETYPE_FLAG,
- "Run speed tests"));
- allowed_options.insert("address", ValueSpec(VALUETYPE_STRING,
- "Address to connect to. ('' = local game)"));
- allowed_options.insert("random-input", ValueSpec(VALUETYPE_FLAG,
- "Enable random user input, for testing"));
- allowed_options.insert("server", ValueSpec(VALUETYPE_FLAG,
- "Run dedicated server"));
- allowed_options.insert("name", ValueSpec(VALUETYPE_STRING,
- "Set player name"));
- allowed_options.insert("password", ValueSpec(VALUETYPE_STRING,
- "Set password"));
- allowed_options.insert("go", ValueSpec(VALUETYPE_FLAG,
- "Disable main menu"));
+ allowed_options.insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
+ _("Show available video modes"))));
+ allowed_options.insert(std::make_pair("speedtests", ValueSpec(VALUETYPE_FLAG,
+ _("Run speed tests"))));
+ allowed_options.insert(std::make_pair("address", ValueSpec(VALUETYPE_STRING,
+ _("Address to connect to. ('' = local game)"))));
+ allowed_options.insert(std::make_pair("random-input", ValueSpec(VALUETYPE_FLAG,
+ _("Enable random user input, for testing"))));
+ allowed_options.insert(std::make_pair("server", ValueSpec(VALUETYPE_FLAG,
+ _("Run dedicated server"))));
+ allowed_options.insert(std::make_pair("name", ValueSpec(VALUETYPE_STRING,
+ _("Set player name"))));
+ allowed_options.insert(std::make_pair("password", ValueSpec(VALUETYPE_STRING,
+ _("Set password"))));
+ allowed_options.insert(std::make_pair("go", ValueSpec(VALUETYPE_FLAG,
+ _("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;
- for(core::map<std::string, ValueSpec>::Iterator
- i = allowed_options.getIterator();
- i.atEnd() == false; i++)
+ dstream<<_("Allowed options:")<<std::endl;
+ for(std::map<std::string, ValueSpec>::iterator
+ i = allowed_options.begin();
+ i != allowed_options.end(); ++i)
{
std::ostringstream os1(std::ios::binary);
- os1<<" --"<<i.getNode()->getKey();
- if(i.getNode()->getValue().type == VALUETYPE_FLAG)
+ os1<<" --"<<i->first;
+ if(i->second.type == VALUETYPE_FLAG)
{}
else
- os1<<" <value>";
+ os1<<_(" <value>");
dstream<<padStringRight(os1.str(), 24);
- if(i.getNode()->getValue().help != NULL)
- dstream<<i.getNode()->getValue().help;
+ if(i->second.help != NULL)
+ dstream<<i->second.help;
dstream<<std::endl;
}
return cmd_args.getFlag("help") ? 0 : 1;
}
-
+
+ if(cmd_args.getFlag("version"))
+ {
+#ifdef SERVER
+ dstream<<"minetestserver "<<minetest_version_hash<<std::endl;
+#else
+ dstream<<"Minetest "<<minetest_version_hash<<std::endl;
+ dstream<<"Using Irrlicht "<<IRRLICHT_SDK_VERSION<<std::endl;
+#endif
+ dstream<<"Build info: "<<minetest_build_info<<std::endl;
+ return 0;
+ }
+
/*
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();
-
+
porting::initializePaths();
// 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);
-
- infostream<<"logfile = "<<logfile<<std::endl;
infostream<<"path_share = "<<porting::path_share<<std::endl;
infostream<<"path_user = "<<porting::path_user<<std::endl;
// Debug handler
BEGIN_DEBUG_EXCEPTION_HANDLER
-
+
// List gameids if requested
if(cmd_args.exists("gameid") && cmd_args.get("gameid") == "list")
{
dstream<<(*i)<<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
- <<", "<<BUILD_INFO
+ infostream<<PROJECT_NAME<<
+ " "<<_("with")<<" SER_FMT_VER_HIGHEST_READ="<<(int)SER_FMT_VER_HIGHEST_READ
+ <<", "<<minetest_build_info
<<std::endl;
-
+
/*
Basic initialization
*/
// Initialize default settings
set_default_settings(g_settings);
-
+
// Initialize sockets
sockets_init();
atexit(sockets_cleanup);
-
+
/*
Read config file
*/
-
+
// Path of configuration file in use
- std::string configpath = "";
-
+ g_settings_path = "";
+
if(cmd_args.exists("config"))
{
bool r = g_settings->readConfigFile(cmd_args.get("config").c_str());
<<cmd_args.get("config")<<"\""<<std::endl;
return 1;
}
- configpath = cmd_args.get("config");
+ g_settings_path = cmd_args.get("config");
}
else
{
- core::array<std::string> filenames;
+ std::vector<std::string> filenames;
filenames.push_back(porting::path_user +
DIR_DELIM + "minetest.conf");
// 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 +
bool r = g_settings->readConfigFile(filenames[i].c_str());
if(r)
{
- configpath = filenames[i];
+ g_settings_path = filenames[i];
break;
}
}
-
+
// If no path found, use the first one (menu creates the file)
- if(configpath == "")
- configpath = filenames[0];
+ if(g_settings_path == "")
+ g_settings_path = 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));
mysrand(time(0));
+#if USE_CURL
+ CURLcode res = curl_global_init(CURL_GLOBAL_DEFAULT);
+ assert(res == CURLE_OK);
+#endif
+
/*
Run unit tests
*/
{
run_tests();
}
-
+#ifdef _MSC_VER
+ init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),g_settings->get("language"),argc,argv);
+#else
+ init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),g_settings->get("language"));
+#endif
+
/*
Game parameters
*/
port = g_settings->getU16("port");
if(port == 0)
port = 30000;
-
+
// World directory
std::string commanded_world = "";
if(cmd_args.exists("world"))
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")) // 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";
+ 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());
+ }
+ }
+
+ // 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
SubgameSpec commanded_gamespec;
if(cmd_args.exists("gameid")){
}
}
+
/*
Run dedicated server if asked to or no other option
*/
#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");
// 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;
}
- 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 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<<"Invalid gamespec. (world_gameid="
- <<world_gameid<<")"<<std::endl;
+ errorstream<<"Subgame ["<<gamespec.id<<"] 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, gamespec, false);
+
+ // Database migration
+ if (cmd_args.exists("migrate")) {
+ std::string migrate_to = cmd_args.get("migrate");
+ Settings world_mt;
+ bool success = world_mt.readConfigFile((world_path + DIR_DELIM + "world.mt").c_str());
+ if (!success) {
+ errorstream << "Cannot read world.mt" << std::endl;
+ return 1;
+ }
+ if (!world_mt.exists("backend")) {
+ errorstream << "Please specify your current backend in world.mt file:"
+ << std::endl << " backend = {sqlite3|leveldb|dummy}" << std::endl;
+ return 1;
+ }
+ std::string backend = world_mt.get("backend");
+ Database *new_db;
+ if (backend == migrate_to) {
+ errorstream << "Cannot migrate: new backend is same as the old one" << std::endl;
+ return 1;
+ }
+ if (migrate_to == "sqlite3")
+ new_db = new Database_SQLite3(&(ServerMap&)server.getMap(), world_path);
+ #if USE_LEVELDB
+ else if (migrate_to == "leveldb")
+ new_db = new Database_LevelDB(&(ServerMap&)server.getMap(), world_path);
+ #endif
+ else {
+ errorstream << "Migration to " << migrate_to << " is not supported" << std::endl;
+ return 1;
+ }
+
+ std::list<v3s16> blocks;
+ ServerMap &old_map = ((ServerMap&)server.getMap());
+ old_map.listAllLoadableBlocks(blocks);
+ int count = 0;
+ new_db->beginSave();
+ for (std::list<v3s16>::iterator i = blocks.begin(); i != blocks.end(); ++i) {
+ MapBlock *block = old_map.loadBlock(*i);
+ new_db->saveBlock(block);
+ MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z));
+ sector->deleteBlock(block);
+ ++count;
+ if (count % 500 == 0)
+ actionstream << "Migrated " << count << " blocks "
+ << (100.0 * count / blocks.size()) << "% completed" << std::endl;
+ }
+ new_db->endSave();
+
+ actionstream << "Successfully migrated " << count << " blocks" << std::endl;
+ world_mt.set("backend", migrate_to);
+ if(!world_mt.updateConfigFile((world_path + DIR_DELIM + "world.mt").c_str()))
+ errorstream<<"Failed to update world.mt!"<<std::endl;
+ else
+ actionstream<<"world.mt updated"<<std::endl;
+
+ return 0;
+ }
+
server.start(port);
-
+
// Run server
dedicated_server_loop(server, kill);
/*
More parameters
*/
-
+
std::string address = g_settings->get("address");
- if(cmd_args.exists("address"))
- address = cmd_args.get("address");
- else if(cmd_args.exists("world"))
+ if(commanded_world != "")
address = "";
-
+ else if(cmd_args.exists("address"))
+ address = cmd_args.get("address");
+
std::string playername = g_settings->get("name");
if(cmd_args.exists("name"))
playername = cmd_args.get("name");
-
+
bool skip_main_menu = cmd_args.getFlag("go");
/*
*/
// 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;
-
+
std::string driverstring = g_settings->get("video_driver");
if(driverstring == "null")
driverType = video::EDT_DIRECT3D9;
else if(driverstring == "opengl")
driverType = video::EDT_OPENGL;
+#ifdef _IRR_COMPILE_WITH_OGLES1_
+ else if(driverstring == "ogles1")
+ driverType = video::EDT_OGLES1;
+#endif
+#ifdef _IRR_COMPILE_WITH_OGLES2_
+ else if(driverstring == "ogles2")
+ driverType = video::EDT_OGLES2;
+#endif
else
{
errorstream<<"WARNING: Invalid video_driver specified; defaulting "
}
/*
- Create device and exit if creation failed
+ List video modes if requested
*/
MyEventReceiver receiver;
+ if(cmd_args.getFlag("videomodes")){
+ IrrlichtDevice *nulldevice;
+
+ SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
+ params.DriverType = video::EDT_NULL;
+ params.WindowSize = core::dimension2d<u32>(640, 480);
+ params.Bits = 24;
+ params.AntiAlias = fsaa;
+ params.Fullscreen = false;
+ params.Stencilbuffer = false;
+ params.Vsync = vsync;
+ params.EventReceiver = &receiver;
+ params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
+
+ nulldevice = createDeviceEx(params);
+
+ if(nulldevice == 0)
+ return 1;
+
+ dstream<<_("Available video modes (WxHxD):")<<std::endl;
+
+ video::IVideoModeList *videomode_list =
+ nulldevice->getVideoModeList();
+
+ if(videomode_list == 0){
+ nulldevice->drop();
+ return 1;
+ }
+
+ s32 videomode_count = videomode_list->getVideoModeCount();
+ core::dimension2d<u32> videomode_res;
+ s32 videomode_depth;
+ for (s32 i = 0; i < videomode_count; ++i){
+ videomode_res = videomode_list->getVideoModeResolution(i);
+ videomode_depth = videomode_list->getVideoModeDepth(i);
+ dstream<<videomode_res.Width<<"x"<<videomode_res.Height
+ <<"x"<<videomode_depth<<std::endl;
+ }
+
+ dstream<<_("Active video mode (WxHxD):")<<std::endl;
+ videomode_res = videomode_list->getDesktopResolution();
+ videomode_depth = videomode_list->getDesktopDepth();
+ dstream<<videomode_res.Width<<"x"<<videomode_res.Height
+ <<"x"<<videomode_depth<<std::endl;
+
+ nulldevice->drop();
+
+ return 0;
+ }
+
+ /*
+ Create device and exit if creation failed
+ */
+
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;
+ params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
+
+ device = createDeviceEx(params);
if (device == 0)
return 1; // could not create selected driver.
-
+
/*
Continue initialization
*/
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.
// Create time getter
g_timegetter = new IrrlichtTimeGetter(device);
-
+
// Create game callback for menus
g_gamecallback = new MainGameCallback(device);
-
+
/*
Speed tests (done after irrlicht is loaded to get timer)
*/
{
dstream<<"Running speed tests"<<std::endl;
SpeedTests();
+ device->drop();
return 0;
}
-
+
device->setResizable(true);
bool random_input = g_settings->getBool("random_input")
input = new RandomInputHandler();
else
input = new RealInputHandler(device, &receiver);
-
+
scene::ISceneManager* smgr = device->getSceneManager();
guienv = device->getGUIEnvironment();
gui::IGUISkin* skin = guienv->getSkin();
- gui::IGUIFont* font = guienv->getFont(getTexturePath("fontlucida.png").c_str());
+ std::string font_path = g_settings->get("font_path");
+ gui::IGUIFont *font;
+ #if USE_FREETYPE
+ bool use_freetype = g_settings->getBool("freetype");
+ if (use_freetype) {
+ std::string fallback;
+ if (is_yes(gettext("needs_fallback_font")))
+ fallback = "fallback_";
+ u16 font_size = g_settings->getU16(fallback + "font_size");
+ font_path = g_settings->get(fallback + "font_path");
+ font = gui::CGUITTFont::createTTFont(guienv, font_path.c_str(), font_size);
+ } else {
+ font = guienv->getFont(font_path.c_str());
+ }
+ #else
+ font = guienv->getFont(font_path.c_str());
+ #endif
if(font)
skin->setFont(font);
else
// If font was not found, this will get us one
font = skin->getFont();
assert(font);
-
+
u32 text_height = font->getDimension(L"Hello, world!").Height;
infostream<<"text_height="<<text_height<<std::endl;
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
+
+
+ // Create the menu clouds
+ if (!g_menucloudsmgr)
+ g_menucloudsmgr = smgr->createNewSceneManager();
+ if (!g_menuclouds)
+ g_menuclouds = new Clouds(g_menucloudsmgr->getRootSceneNode(),
+ g_menucloudsmgr, -1, rand(), 100);
+ g_menuclouds->update(v2f(0, 0), video::SColor(255,200,200,255));
+ scene::ICameraSceneNode* camera;
+ camera = g_menucloudsmgr->addCameraSceneNode(0,
+ v3f(0,0,0), v3f(0, 60, 100));
+ camera->setFarValue(10000);
+
/*
GUI stuff
*/
while(device->run() && kill == false)
{
// Set the window caption
- device->setWindowCaption(L"Minetest [Main Menu]");
+ wchar_t* text = wgettext("Main Menu");
+ device->setWindowCaption((std::wstring(L"Minetest [")+text+L"]").c_str());
+ delete[] text;
// This is used for catching disconnects
try
Clear everything from the GUIEnvironment
*/
guienv->clear();
-
+
/*
We need some kind of a root node to be able to add
custom gui elements directly on the screen.
*/
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.
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();
-
+
// Initialize menu data
MainMenuData menudata;
- menudata.address = narrow_to_wide(address);
- menudata.name = narrow_to_wide(playername);
- menudata.port = narrow_to_wide(itos(port));
+ menudata.address = address;
+ menudata.name = playername;
+ menudata.port = itos(port);
+ menudata.errormessage = wide_to_narrow(error_message);
+ error_message = L"";
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.creative_mode = g_settings->getBool("creative_mode");
- menudata.enable_damage = g_settings->getBool("enable_damage");
- // Get world listing for the menu
+ menudata.password = cmd_args.get("password");
+
+ driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
+
+ menudata.enable_public = g_settings->getBool("server_announce");
+
std::vector<WorldSpec> worldspecs = getAvailableWorlds();
- for(std::vector<WorldSpec>::const_iterator i = worldspecs.begin();
- i != worldspecs.end(); i++)
- menudata.worlds.push_back(narrow_to_wide(
- i->name + " [" + i->gameid + "]"));
- // Default to selecting nothing
- menudata.selected_world = -1;
- // 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);
- if(gameid == "")
+ std::string name = _("[--world parameter]");
+ if(gameid == ""){
gameid = g_settings->get("default_game");
- WorldSpec spec(commanded_world, "--world", gameid);
- worldspecs.push_back(spec);
- menudata.worlds.push_back(narrow_to_wide(spec.name)
- +L" ["+narrow_to_wide(spec.gameid)+L"]");
- menudata.selected_world = menudata.worlds.size()-1;
+ name += " [new]";
+ }
+ //TODO find within worldspecs and set config
}
if(skip_main_menu == false)
{
- GUIMainMenu *menu =
- new GUIMainMenu(guienv, guiroot, -1,
- &g_menumgr, &menudata, g_gamecallback);
- menu->allowFocusRemoval(true);
-
- if(error_message != L"")
- {
- verbosestream<<"error_message = "
- <<wide_to_narrow(error_message)<<std::endl;
-
- GUIMessageMenu *menu2 =
- new GUIMessageMenu(guienv, guiroot, -1,
- &g_menumgr, error_message.c_str());
- menu2->drop();
- error_message = L"";
- }
-
video::IVideoDriver* driver = device->getVideoDriver();
-
- infostream<<"Created main menu"<<std::endl;
+ infostream<<"Waiting for other menus"<<std::endl;
while(device->run() && kill == false)
{
- if(menu->getStatus() == true)
+ if(noMenuActive())
break;
-
- //driver->beginScene(true, true, video::SColor(255,0,0,0));
- driver->beginScene(true, true, video::SColor(255,128,128,128));
-
- drawMenuBackground(driver);
-
+ driver->beginScene(true, true,
+ video::SColor(255,128,128,128));
guienv->drawAll();
-
driver->endScene();
-
// On some computers framerate doesn't seem to be
// automatically limited
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;
+ infostream<<"Waited for other menus"<<std::endl;
- menu->drop();
- }
+ GUIEngine* temp = new GUIEngine(device, guiroot, &g_menumgr,smgr,&menudata,kill);
- // 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)
- {
- if(menudata.selected_world == -1){
- error_message = L"Cannot delete world: "
- L"no world selected";
- errorstream<<wide_to_narrow(error_message)<<std::endl;
- continue;
- }
- /*bool r = fs::RecursiveDeleteContent(worldspec.path);
- if(r == false){
- error_message = L"World delete failed";
- errorstream<<wide_to_narrow(error_message)<<std::endl;
- }*/
- // TODO: Some kind of a yes/no dialog is needed.
- error_message = L"This doesn't do anything currently.";
- errorstream<<wide_to_narrow(error_message)<<std::endl;
- continue;
+ delete temp;
+ //once finished you'll never end up here
+ smgr->clear();
}
- // 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
- + wide_to_narrow(menudata.create_world_name);
- // Create world if it doesn't exist
- if(!initializeWorld(path, menudata.create_world_gameid)){
- error_message = L"Failed to initialize world";
- errorstream<<wide_to_narrow(error_message)<<std::endl;
- continue;
- }
- g_settings->set("selected_world_path", path);
+ if(menudata.errormessage != ""){
+ error_message = narrow_to_wide(menudata.errormessage);
continue;
}
- playername = wide_to_narrow(menudata.name);
- password = translatePassword(playername, menudata.password);
+ //update worldspecs (necessary as new world may have been created)
+ worldspecs = getAvailableWorlds();
+
+ if (menudata.name == "")
+ menudata.name = std::string("Guest") + itos(myrand_range(1000,9999));
+ else
+ playername = menudata.name;
+
+ password = translatePassword(playername, narrow_to_wide(menudata.password));
//infostream<<"Main: password hash: '"<<password<<"'"<<std::endl;
- address = wide_to_narrow(menudata.address);
- int newport = stoi(wide_to_narrow(menudata.port));
+ address = menudata.address;
+ int newport = stoi(menudata.port);
if(newport != 0)
port = newport;
+
+ simple_singleplayer_mode = menudata.simple_singleplayer_mode;
+
// 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)
+
+ if((menudata.selected_world >= 0) &&
+ (menudata.selected_world < (int)worldspecs.size()))
g_settings->set("selected_world_path",
worldspecs[menudata.selected_world].path);
- // Update configuration file
- if(configpath != "")
- g_settings->updateConfigFile(configpath.c_str());
-
+
+ // 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 = myrand_range(49152, 65535);
+ }
+ else if (address != "")
+ {
+ ServerListSpec server;
+ server["name"] = menudata.servername;
+ server["address"] = menudata.address;
+ server["port"] = menudata.port;
+ server["description"] = menudata.serverdescription;
+ ServerList::insert(server);
+ }
+
+ // Set world path to selected one
+ if ((menudata.selected_world >= 0) &&
+ (menudata.selected_world < (int)worldspecs.size())) {
+ worldspec = worldspecs[menudata.selected_world];
+ infostream<<"Selected world: "<<worldspec.name
+ <<" ["<<worldspec.path<<"]"<<std::endl;
+ }
+
// If local game
- if(address == "")
+ if(current_address == "")
{
if(menudata.selected_world == -1){
- error_message = L"No world selected and no address "
- L"provided. Nothing to do.";
+ 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 = findSubgame(worldspec.gameid);
+ gamespec = findWorldSubgame(worldspec.path);
if(!gamespec.isValid() && !commanded_gamespec.isValid()){
- error_message = L"Could not find or load game \""
+ 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(!gamespec.isValid()){
- error_message = L"Invalid gamespec. (world_gameid="
+ 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)
+ if(device->run() == false || kill == true) {
+ if(g_settings_path != "") {
+ g_settings->updateConfigFile(
+ g_settings_path.c_str());
+ }
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
);
+ smgr->clear();
} //try
catch(con::PeerNotFoundException &e)
{
- error_message = L"Connection error (timed out?)";
- errorstream<<wide_to_narrow(error_message)<<std::endl;
- }
- catch(ServerError &e)
- {
- error_message = narrow_to_wide(e.what());
+ error_message = wgettext("Connection error (timed out?)");
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.";
- }
#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;
break;
}
} // Menu-game loop
-
+
+
+ g_menuclouds->drop();
+ g_menucloudsmgr->drop();
+
delete input;
/*
*/
device->drop();
+#if USE_FREETYPE
+ if (use_freetype)
+ font->drop();
+#endif
+
#endif // !SERVER
-
+
// Update configuration file
- if(configpath != "")
- g_settings->updateConfigFile(configpath.c_str());
-
+ if(g_settings_path != "")
+ g_settings->updateConfigFile(g_settings_path.c_str());
+
// Print modified quicktune values
{
bool header_printed = false;
}
END_DEBUG_EXCEPTION_HANDLER(errorstream)
-
+
debugstreams_deinit();
-
+
return retval;
}