]> git.lizzy.rs Git - minetest.git/blobdiff - src/main.cpp
Fix selectionbox not honoring anaglyph mode 3d distortion
[minetest.git] / src / main.cpp
index 67aa82bc4d299eada1c49609f0fa7d412dacb050..940580b7a067d563093232733b380bb7c858eec7 100644 (file)
@@ -76,6 +76,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "subgame.h"
 #include "quicktune.h"
 #include "serverlist.h"
+#include "guiEngine.h"
 
 /*
        Settings.
@@ -83,11 +84,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 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
 */
@@ -196,7 +202,6 @@ u32 getTime(TimePrecision prec) {
                return 0;
        return g_timegetter->getTime(prec);
 }
-
 #endif
 
 class StderrLogOutput: public ILogOutput
@@ -239,7 +244,7 @@ class MyEventReceiver : public IEventReceiver
                */
                if(noMenuActive() == false)
                {
-                       return false;
+                       return g_menumgr.preprocessEvent(event);
                }
 
                // Remember whether each key is down or up
@@ -612,64 +617,6 @@ class RandomInputHandler : public InputHandler
        bool rightreleased;
 };
 
-void drawMenuBackground(video::IVideoDriver* driver, const SubgameSpec *spec)
-{
-       v2u32 screensize = driver->getScreenSize();
-
-       /* Figure out background texture */
-       video::ITexture *texture = NULL;
-       if(spec && spec->menubackground_path != ""){
-               texture = driver->getTexture(spec->menubackground_path.c_str());
-       }
-
-       /* If no texture, draw background of solid color */
-       if(!texture){
-               video::SColor color(255,80,58,37);
-               core::rect<s32> rect(0, 0, screensize.X, screensize.Y);
-               driver->draw2DRectangle(color, rect, NULL);
-               return;
-       }
-
-       /* Draw background texture */
-       v2u32 sourcesize = texture->getSize();
-       driver->draw2DImage(texture,
-               core::rect<s32>(0, 0, screensize.X, screensize.Y),
-               core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
-               NULL, NULL, true);
-}
-
-void drawMenuOverlay(video::IVideoDriver* driver, const SubgameSpec *spec)
-{
-       v2u32 screensize = driver->getScreenSize();
-
-       /* Figure out overlay texture */
-       video::ITexture *texture = NULL;
-       if(spec && spec->menuoverlay_path != ""){
-               texture = driver->getTexture(spec->menuoverlay_path.c_str());
-       }
-
-       /* If no texture, draw nothing */
-       if(!texture)
-               return;
-
-       /* Draw overlay texture */
-       v2u32 sourcesize = texture->getSize();
-       driver->draw2DImage(texture,
-               core::rect<s32>(0, 0, screensize.X, screensize.Y),
-               core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
-               NULL, NULL, true);
-}
-
-static const SubgameSpec* getMenuGame(const MainMenuData &menudata)
-{
-       for(size_t i=0; i<menudata.games.size(); i++){
-               if(menudata.games[i].id == menudata.selected_game){
-                       return &menudata.games[i];
-               }
-       }
-       return NULL;
-}
-
 #endif // !SERVER
 
 // These are defined global so that they're not optimized too much.
@@ -843,6 +790,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,
@@ -942,10 +891,10 @@ 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
+                       " "<<_("with")<<" SER_FMT_VER_HIGHEST_READ="<<(int)SER_FMT_VER_HIGHEST_READ
                        <<", "<<BUILD_INFO
                        <<std::endl;
        
@@ -965,7 +914,7 @@ int main(int argc, char *argv[])
        */
        
        // Path of configuration file in use
-       std::string configpath = "";
+       g_settings_path = "";
        
        if(cmd_args.exists("config"))
        {
@@ -976,7 +925,7 @@ int main(int argc, char *argv[])
                                        <<cmd_args.get("config")<<"\""<<std::endl;
                        return 1;
                }
-               configpath = cmd_args.get("config");
+               g_settings_path = cmd_args.get("config");
        }
        else
        {
@@ -998,14 +947,14 @@ int main(int argc, char *argv[])
                        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
@@ -1245,7 +1194,7 @@ int main(int argc, char *argv[])
                verbosestream<<_("Using gameid")<<" ["<<gamespec.id<<"]"<<std::endl;
 
                // Create server
-               Server server(world_path, configpath, gamespec, false);
+               Server server(world_path, gamespec, false);
                server.start(port);
                
                // Run server
@@ -1322,11 +1271,65 @@ 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;
+               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;
 
        SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
@@ -1338,6 +1341,7 @@ int main(int argc, char *argv[])
        params.Stencilbuffer = false;
        params.Vsync         = vsync;
        params.EventReceiver = &receiver;
+       params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
 
        device = createDeviceEx(params);
 
@@ -1369,6 +1373,7 @@ int main(int argc, char *argv[])
        {
                dstream<<"Running speed tests"<<std::endl;
                SpeedTests();
+               device->drop();
                return 0;
        }
        
@@ -1386,12 +1391,18 @@ int main(int argc, char *argv[])
 
        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);
+       gui::IGUIFont *font;
+       bool use_freetype = g_settings->getBool("freetype");
+       #if USE_FREETYPE
+       if (use_freetype) {
+               u16 font_size = g_settings->getU16("font_size");
+               font = gui::CGUITTFont::createTTFont(guienv, font_path.c_str(), font_size);
+       } else {
+               font = guienv->getFont(font_path.c_str());
+       }
        #else
-       gui::IGUIFont* font = guienv->getFont(getTexturePath("fontlucida.png").c_str());
+       font = guienv->getFont(font_path.c_str());
        #endif
        if(font)
                skin->setFont(font);
@@ -1420,6 +1431,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
        */
@@ -1497,78 +1521,36 @@ 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");
-                               if(g_settings->exists("selected_serverlist"))
-                                       menudata.selected_serverlist = g_settings->getS32("selected_serverlist");
-                               if(g_settings->exists("selected_mainmenu_game"))
-                                       menudata.selected_game = g_settings->get("selected_mainmenu_game");
-                               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.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");
-                               menudata.liquid_finite = g_settings->getBool("liquid_finite");
-                               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;
-                               // Get game listing
-                               menudata.games = getAvailableGames();
-                               // If selected game doesn't exist, take first from list
-                               if(findSubgame(menudata.selected_game).id == "" &&
-                                               !menudata.games.empty()){
-                                       menudata.selected_game = menudata.games[0].id;
-                               }
-                               const SubgameSpec *menugame = getMenuGame(menudata);
 
                                if(skip_main_menu == false)
                                {
                                        video::IVideoDriver* driver = device->getVideoDriver();
-                                       float fps_max = g_settings->getFloat("fps_max");
+
                                        infostream<<"Waiting for other menus"<<std::endl;
                                        while(device->run() && kill == false)
                                        {
@@ -1576,7 +1558,6 @@ int main(int argc, char *argv[])
                                                        break;
                                                driver->beginScene(true, true,
                                                                video::SColor(255,128,128,128));
-                                               drawMenuBackground(driver, menugame);
                                                guienv->drawAll();
                                                driver->endScene();
                                                // On some computers framerate doesn't seem to be
@@ -1585,161 +1566,43 @@ 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);
-
-                                       // Always create clouds because they may or may not be
-                                       // needed based on the game selected
-                                       Clouds *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;
-
-                                               // Game can be selected in the menu
-                                               menugame = getMenuGame(menudata);
-                                               // Clouds for the main menu
-                                               bool cloud_menu_background = g_settings->getBool("menu_clouds");
-                                               if(menugame){
-                                                       // If game has regular background and no overlay, don't use clouds
-                                                       if(cloud_menu_background &&
-                                                                       menugame->menuoverlay_path.empty() &&
-                                                                       !menugame->menubackground_path.empty()){
-                                                               cloud_menu_background = false;
-                                                       }
-                                                       // If game game has overlay and no regular background, always draw clouds
-                                                       else if(menugame->menubackground_path.empty() &&
-                                                                       !menugame->menuoverlay_path.empty()){
-                                                               cloud_menu_background = true;
-                                                       }
-                                               }
-
-                                               // 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();
-                                                       drawMenuOverlay(driver, menugame);
-                                               } else {
-                                                       drawMenuBackground(driver, menugame);
-                                               }
-
-                                               guienv->drawAll();
-
-                                               driver->endScene();
-                                               
-                                               // On some computers framerate doesn't seem to be
-                                               // automatically limited
-                                               if (cloud_menu_background) {
-                                                       // Time of frame without fps limit
-                                                       float busytime;
-                                                       u32 busytime_u32;
-                                                       // not using getRealTime is necessary for wine
-                                                       u32 time = device->getTimer()->getTime();
-                                                       if(time > lasttime)
-                                                               busytime_u32 = time - lasttime;
-                                                       else
-                                                               busytime_u32 = 0;
-                                                       busytime = busytime_u32 / 1000.0;
-
-                                                       // FPS limiter
-                                                       u32 frametime_min = 1000./fps_max;
-                       
-                                                       if(busytime_u32 < frametime_min) {
-                                                               u32 sleeptime = frametime_min - busytime_u32;
-                                                               device->sleep(sleeptime);
-                                                       }
-                                               } else {
-                                                       sleep_ms(25);
-                                               }
-                                       }
+                                       GUIEngine* temp = new GUIEngine(device, guiroot, &g_menumgr,smgr,&menudata,kill);
                                        
-                                       infostream<<"Dropping main menu"<<std::endl;
-
-                                       menu->drop();
-                                       clouds->drop();
+                                       delete temp;
+                                       //once finished you'll never end up here
                                        smgr->clear();
                                }
 
-                               playername = wide_to_narrow(menudata.name);
-                               if (playername == "")
-                                       playername = std::string("Guest") + itos(myrand_range(1000,9999));
-                               password = translatePassword(playername, menudata.password);
+                               if(menudata.errormessage != ""){
+                                       error_message = narrow_to_wide(menudata.errormessage);
+                                       continue;
+                               }
+
+                               //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->setS32("selected_serverlist", menudata.selected_serverlist);
-                               g_settings->set("selected_mainmenu_game", menudata.selected_game);
-                               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("liquid_finite", itos(menudata.liquid_finite));
-
-                               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);
 
@@ -1757,47 +1620,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 == "")
                                {
@@ -1835,10 +1677,15 @@ int main(int argc, char *argv[])
                                // 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
@@ -1855,11 +1702,11 @@ int main(int argc, char *argv[])
                                current_address,
                                current_port,
                                error_message,
-                               configpath,
                                chat_backend,
                                gamespec,
                                simple_singleplayer_mode
                        );
+                       smgr->clear();
 
                } //try
                catch(con::PeerNotFoundException &e)
@@ -1889,7 +1736,11 @@ int main(int argc, char *argv[])
                        break;
                }
        } // Menu-game loop
-       
+
+
+       g_menuclouds->drop();
+       g_menucloudsmgr->drop();
+
        delete input;
 
        /*
@@ -1897,11 +1748,16 @@ int main(int argc, char *argv[])
        */
        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
        {