]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/main.cpp
Randomly choose singleplayer port
[dragonfireclient.git] / src / main.cpp
index e5aa3017d8b4b59908d511dbd584fc55d48e13d1..8ed164d1f2f1b04db3a1537f7e41c7fffb10a7e3 100644 (file)
@@ -76,6 +76,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "subgame.h"
 #include "quicktune.h"
 #include "serverlist.h"
+#include "sound.h"
+#include "sound_openal.h"
+#include "guiEngine.h"
 
 /*
        Settings.
@@ -88,6 +91,10 @@ Settings *g_settings = &main_settings;
 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
 */
@@ -133,7 +140,12 @@ MainGameCallback *g_gamecallback = NULL;
 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
@@ -142,7 +154,7 @@ u32 getTimeMs()
 class TimeGetter
 {
 public:
-       virtual u32 getTime() = 0;
+       virtual u32 getTime(TimePrecision prec) = 0;
 };
 
 // A precise irrlicht one
@@ -152,11 +164,15 @@ class IrrlichtTimeGetter: public TimeGetter
        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;
@@ -165,9 +181,9 @@ class IrrlichtTimeGetter: public TimeGetter
 class SimpleTimeGetter: public TimeGetter
 {
 public:
-       u32 getTime()
+       u32 getTime(TimePrecision prec)
        {
-               return porting::getTimeMs();
+               return porting::getTime(prec);
        }
 };
 
@@ -179,9 +195,57 @@ u32 getTimeMs()
 {
        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
+
+//Client side main menu music fetcher
+#ifndef SERVER
+class MenuMusicFetcher: public OnDemandSoundFetcher
+{
+       std::set<std::string> m_fetched;
+public:
+
+       void fetchSounds(const std::string &name,
+                       std::set<std::string> &dst_paths,
+                       std::set<std::string> &dst_datas)
+       {
+               if(m_fetched.count(name))
+                       return;
+               m_fetched.insert(name);
+               std::string base;
+               base = porting::path_share + DIR_DELIM + "sounds";
+               dst_paths.insert(base + DIR_DELIM + name + ".ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".0.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".1.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".2.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".3.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".4.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".5.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".6.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".7.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".8.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".9.ogg");
+               base = porting::path_user + DIR_DELIM + "sounds";
+               dst_paths.insert(base + DIR_DELIM + name + ".ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".0.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".1.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".2.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".3.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".4.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".5.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".6.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".7.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".8.ogg");
+               dst_paths.insert(base + DIR_DELIM + name + ".9.ogg");
+               }
+};
 #endif
 
 class StderrLogOutput: public ILogOutput
@@ -597,124 +661,7 @@ class RandomInputHandler : public InputHandler
        bool rightreleased;
 };
 
-//Draw the tiled menu background
-void drawMenuBackground(video::IVideoDriver* driver) {
-       core::dimension2d<u32> screensize = driver->getScreenSize();
-
-       std::string path = getTexturePath("menubg.png");
-       if (path[0]) {
-               video::ITexture *bgtexture =
-                       driver->getTexture(path.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);
-               }
-       }
-}
-
-//Draw the footer at the bottom of the window
-void drawMenuFooter(video::IVideoDriver* driver, bool clouds) {
-       core::dimension2d<u32> screensize = driver->getScreenSize();
-       std::string path = getTexturePath(clouds ?
-                                               "menufooter_clouds.png" : "menufooter.png");
-       if (path[0]) {
-               video::ITexture *footertexture =
-                       driver->getTexture(path.c_str());
-
-               if (footertexture) {
-                       f32 mult = (((f32)screensize.Width)) /
-                               ((f32)footertexture->getOriginalSize().Width);
-
-                       v2s32 footersize(((f32)footertexture->getOriginalSize().Width) * mult,
-                                       ((f32)footertexture->getOriginalSize().Height) * mult);
-
-                       // Don't draw the footer if there isn't enough room
-                       s32 free_space = (((s32)screensize.Height)-320)/2;
-                       if (free_space > footersize.Y) {
-                               core::rect<s32> rect(0,0,footersize.X,footersize.Y);
-                               rect += v2s32(screensize.Width/2,screensize.Height-footersize.Y);
-                               rect -= v2s32(footersize.X/2, 0);
-
-                               driver->draw2DImage(footertexture, rect,
-                                       core::rect<s32>(core::position2d<s32>(0,0),
-                                       core::dimension2di(footertexture->getSize())),
-                                       NULL, NULL, true);
-                       }
-               }
-       }
-}
-
-// Draw the Header over the main menu
-void drawMenuHeader(video::IVideoDriver* driver) {
-       core::dimension2d<u32> screensize = driver->getScreenSize();
-
-       std::string path = getTexturePath("menuheader.png");
-       if (path[0]) {
-               video::ITexture *splashtexture =
-               driver->getTexture(path.c_str());
-
-               if(splashtexture) {
-                       //v2s32 splashsize((splashtexture->getOriginalSize().Width*100)/
-                       //      splashtexture->getOriginalSize().Height, 80);
-
-                       f32 mult = (((f32)screensize.Width / 2)) /
-                               ((f32)splashtexture->getOriginalSize().Width);
-
-                       v2s32 splashsize(((f32)splashtexture->getOriginalSize().Width) * mult,
-                                       ((f32)splashtexture->getOriginalSize().Height) * mult);
-
-                       // Don't draw the header is there isn't enough room
-                       s32 free_space = (((s32)screensize.Height)-320)/2;
-                       if (free_space > splashsize.Y) {
-                               core::rect<s32> splashrect(0, 0, splashsize.X, splashsize.Y);
-                               splashrect += v2s32((screensize.Width/2)-(splashsize.X/2),
-                                       ((free_space/2)-splashsize.Y/2)+10);
-
-                               video::SColor bgcolor(255,50,50,50);
-
-                               driver->draw2DImage(splashtexture, splashrect,
-                                       core::rect<s32>(core::position2d<s32>(0,0),
-                                       core::dimension2di(splashtexture->getSize())),
-                                       NULL, NULL, true);
-                       }
-               }
-       }
-}
-
-// Draw the Splash over the clouds and under the main menu
-void drawMenuSplash(video::IVideoDriver* driver) {
-       core::dimension2d<u32> screensize = driver->getScreenSize();
-       if (getTexturePath("menusplash.png") != "") {
-               video::ITexture *splashtexture =
-                       driver->getTexture(getTexturePath("menusplash.png").c_str());
-
-               if(splashtexture) {
-                       core::rect<s32> splashrect(0, 0, screensize.Width, screensize.Height);
-
-                       video::SColor bgcolor(255,50,50,50);
-
-                       driver->draw2DImage(splashtexture, splashrect,
-                               core::rect<s32>(core::position2d<s32>(0,0),
-                               core::dimension2di(splashtexture->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.
@@ -805,7 +752,7 @@ void SpeedTests()
                        }
                }
                // Do at least 10ms
-               while(timer.getTime() < 10);
+               while(timer.getTimerTime() < 10);
 
                u32 dtime = timer.stop();
                u32 per_ms = n / dtime;
@@ -887,6 +834,8 @@ int main(int argc, char *argv[])
        allowed_options.insert(std::make_pair("gameid", ValueSpec(VALUETYPE_STRING,
                        _("Set gameid (\"--gameid list\" prints available ones)"))));
 #ifndef SERVER
+       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,
@@ -986,7 +935,7 @@ int main(int argc, char *argv[])
                print_worldspecs(worldspecs, dstream);
                return 0;
        }
-       
+
        // Print startup message
        infostream<<PROJECT_NAME<<
                        " "<<_("with")<<" SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
@@ -1366,11 +1315,64 @@ int main(int argc, char *argv[])
        }
 
        /*
-               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;
+
+               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;
 
        SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
@@ -1413,6 +1415,7 @@ int main(int argc, char *argv[])
        {
                dstream<<"Running speed tests"<<std::endl;
                SpeedTests();
+               device->drop();
                return 0;
        }
        
@@ -1464,6 +1467,19 @@ int main(int argc, char *argv[])
        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
        */
@@ -1488,7 +1504,9 @@ int main(int argc, char *argv[])
        while(device->run() && kill == false)
        {
                // Set the window caption
-               device->setWindowCaption((std::wstring(L"Minetest [")+wgettext("Main Menu")+L"]").c_str());
+               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
@@ -1539,65 +1557,37 @@ int main(int argc, char *argv[])
                                
                                // 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));
+                               menudata.kill = kill;
+                               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.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");
+                                       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");
-                               // 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;
+                                       //TODO find within worldspecs and set config
                                }
-                               // 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)
                                        {
@@ -1605,7 +1595,6 @@ int main(int argc, char *argv[])
                                                        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
@@ -1614,127 +1603,40 @@ int main(int argc, char *argv[])
                                        }
                                        infostream<<"Waited for other menus"<<std::endl;
 
-                                       GUIMainMenu *menu =
-                                                       new GUIMainMenu(guienv, guiroot, -1, 
-                                                               &g_menumgr, &menudata, g_gamecallback);
-                                       menu->allowFocusRemoval(true);
-
-                                       // Clouds for the main menu
-                                       bool cloud_menu_background = false;
-                                       Clouds *clouds = NULL;
-                                       if (g_settings->getBool("menu_clouds")) {
-                                               cloud_menu_background = true;
-                                               clouds = new Clouds(smgr->getRootSceneNode(),
-                                                                                       smgr, -1, rand(), 100);
-                                               clouds->update(v2f(0, 0), video::SColor(255,200,200,255));
-
-                                               // A camera to see the clouds
-                                               scene::ICameraSceneNode* camera;
-                                               camera = smgr->addCameraSceneNode(0,
-                                                                       v3f(0,0,0), v3f(0, 60, 100));
-                                               camera->setFarValue(10000);
-                                       }
-
-                                       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"";
-                                       }
-
-                                       // Time is in milliseconds, for clouds
-                                       u32 lasttime = device->getTimer()->getTime();
-
-                                       infostream<<"Created main menu"<<std::endl;
-
-                                       while(device->run() && kill == false)
-                                       {
-                                               if(menu->getStatus() == true)
-                                                       break;
-
-                                               // Time calc for the clouds
-                                               f32 dtime; // in seconds
-                                               if (cloud_menu_background) {
-                                                       u32 time = device->getTimer()->getTime();
-                                                       if(time > lasttime)
-                                                               dtime = (time - lasttime) / 1000.0;
-                                                       else
-                                                               dtime = 0;
-                                                       lasttime = time;
-                                               }
-
-                                               //driver->beginScene(true, true, video::SColor(255,0,0,0));
-                                               driver->beginScene(true, true, video::SColor(255,140,186,250));
-
-                                               if (cloud_menu_background) {
-                                                       // *3 otherwise the clouds would move very slowly
-                                                       clouds->step(dtime*3); 
-                                                       clouds->render();
-                                                       smgr->drawAll();
-                                                       drawMenuSplash(driver);
-                                                       drawMenuFooter(driver, true);
-                                                       drawMenuHeader(driver);
-                                               } else {
-                                                       drawMenuBackground(driver);
-                                                       drawMenuFooter(driver, false);
-                                               }
-
-                                               guienv->drawAll();
-
-                                               driver->endScene();
-                                               
-                                               // On some computers framerate doesn't seem to be
-                                               // automatically limited
-                                               if (!cloud_menu_background)
-                                                       sleep_ms(25);
-                                       }
+                                       GUIEngine* temp = new GUIEngine(device, guiroot, &g_menumgr,smgr,&menudata);
                                        
-                                       infostream<<"Dropping main menu"<<std::endl;
+                                       delete temp;
+                                       //once finished you'll never end up here
+                                       smgr->clear();
+                                       kill = menudata.kill;
 
-                                       menu->drop();
-                                       if (cloud_menu_background) {
-                                               clouds->drop();
-                                               smgr->clear();
-                                       }
                                }
 
-                               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->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));
-                               if(menudata.selected_world != -1)
+
+                               if((menudata.selected_world >= 0) &&
+                                               (menudata.selected_world < worldspecs.size()))
                                        g_settings->set("selected_world_path",
                                                        worldspecs[menudata.selected_world].path);
 
@@ -1752,47 +1654,26 @@ int main(int argc, char *argv[])
                                        current_playername = "singleplayer";
                                        current_password = "";
                                        current_address = "";
-                                       current_port = 30011;
+                                       current_port = myrand_range(49152, 65535);
                                }
                                else if (address != "")
                                {
                                        ServerListSpec server;
                                        server["name"] = menudata.servername;
-                                       server["address"] = wide_to_narrow(menudata.address);
-                                       server["port"] = wide_to_narrow(menudata.port);
+                                       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 != -1){
+                               if ((menudata.selected_world >= 0) &&
+                                       (menudata.selected_world < worldspecs.size())) {
                                        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 == "")
                                {
@@ -1832,8 +1713,10 @@ int main(int argc, char *argv[])
                        }
                        
                        // Break out of menu-game loop to shut down cleanly
-                       if(device->run() == false || kill == true)
+                       if(device->run() == false || kill == true) {
+                               g_settings->updateConfigFile(configpath.c_str());
                                break;
+                       }
 
                        /*
                                Run game
@@ -1855,6 +1738,7 @@ int main(int argc, char *argv[])
                                gamespec,
                                simple_singleplayer_mode
                        );
+                       smgr->clear();
 
                } //try
                catch(con::PeerNotFoundException &e)
@@ -1862,16 +1746,6 @@ int main(int argc, char *argv[])
                        error_message = wgettext("Connection error (timed out?)");
                        errorstream<<wide_to_narrow(error_message)<<std::endl;
                }
-               catch(ServerError &e)
-               {
-                       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()) + wgettext("\nCheck debug.txt for details.");
-               }
 #ifdef NDEBUG
                catch(std::exception &e)
                {
@@ -1894,7 +1768,11 @@ int main(int argc, char *argv[])
                        break;
                }
        } // Menu-game loop
-       
+
+
+       g_menuclouds->drop();
+       g_menucloudsmgr->drop();
+
        delete input;
 
        /*
@@ -1902,6 +1780,10 @@ int main(int argc, char *argv[])
        */
        device->drop();
 
+#if USE_FREETYPE
+       font->drop();
+#endif
+
 #endif // !SERVER
        
        // Update configuration file