]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/main.cpp
Removed a redundant step which degraded performance
[dragonfireclient.git] / src / main.cpp
index 1774641f14297ef3eb8ac2bca7defb07e7c94631..eda992793641949068475179dc0afc16a71bf240 100644 (file)
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+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 Lesser General Public License as published by
@@ -50,6 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "test.h"
+#include "clouds.h"
 #include "server.h"
 #include "constants.h"
 #include "porting.h"
@@ -75,6 +76,8 @@ 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"
 
 /*
        Settings.
@@ -87,6 +90,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
 */
@@ -132,7 +139,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
@@ -141,7 +153,7 @@ u32 getTimeMs()
 class TimeGetter
 {
 public:
-       virtual u32 getTime() = 0;
+       virtual u32 getTime(TimePrecision prec) = 0;
 };
 
 // A precise irrlicht one
@@ -151,11 +163,15 @@ class IrrlichtTimeGetter: public TimeGetter
        IrrlichtTimeGetter(IrrlichtDevice *device):
                m_device(device)
        {}
-       u32 getTime()
-       {
-               if(m_device == NULL)
-                       return 0;
-               return m_device->getTimer()->getRealTime();
+       u32 getTime(TimePrecision prec)
+       {
+               if (prec == PRECISION_MILLI) {
+                       if(m_device == NULL)
+                               return 0;
+                       return m_device->getTimer()->getRealTime();
+               } else {
+                       return porting::getTime(prec);
+               }
        }
 private:
        IrrlichtDevice *m_device;
@@ -164,9 +180,9 @@ class IrrlichtTimeGetter: public TimeGetter
 class SimpleTimeGetter: public TimeGetter
 {
 public:
-       u32 getTime()
+       u32 getTime(TimePrecision prec)
        {
-               return porting::getTimeMs();
+               return porting::getTime(prec);
        }
 };
 
@@ -178,9 +194,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
@@ -596,54 +660,181 @@ class RandomInputHandler : public InputHandler
        bool rightreleased;
 };
 
-void drawMenuBackground(video::IVideoDriver* driver)
+struct MenuTextures
+{
+       std::string current_gameid;
+       bool global_textures;
+       video::ITexture *background;
+       video::ITexture *overlay;
+       video::ITexture *header;
+       video::ITexture *footer;
+
+       MenuTextures():
+               global_textures(false),
+               background(NULL),
+               overlay(NULL),
+               header(NULL),
+               footer(NULL)
+       {}
+
+       static video::ITexture* getMenuTexture(const std::string &tname,
+                       video::IVideoDriver* driver, const SubgameSpec *spec)
+       {
+               if(spec){
+                       std::string path;
+                       // eg. minetest_menu_background.png (for texture packs)
+                       std::string pack_tname = spec->id + "_menu_" + tname + ".png";
+                       path = getTexturePath(pack_tname);
+                       if(path != "")
+                               return driver->getTexture(path.c_str());
+                       // eg. games/minetest_game/menu/background.png
+                       path = getImagePath(spec->path + DIR_DELIM + "menu" + DIR_DELIM + tname + ".png");
+                       if(path != "")
+                               return driver->getTexture(path.c_str());
+               } else {
+                       std::string path;
+                       // eg. menu_background.png
+                       std::string pack_tname = "menu_" + tname + ".png";
+                       path = getTexturePath(pack_tname);
+                       if(path != "")
+                               return driver->getTexture(path.c_str());
+               }
+               return NULL;
+       }
+
+       void update(video::IVideoDriver* driver, const SubgameSpec *spec, int tab)
+       {
+               if(tab == TAB_SINGLEPLAYER){
+                       if(spec->id == current_gameid)
+                               return;
+                       current_gameid = spec->id;
+                       global_textures = false;
+                       background = getMenuTexture("background", driver, spec);
+                       overlay = getMenuTexture("overlay", driver, spec);
+                       header = getMenuTexture("header", driver, spec);
+                       footer = getMenuTexture("footer", driver, spec);
+               } else {
+                       if(global_textures)
+                               return;
+                       current_gameid = "";
+                       global_textures = true;
+                       background = getMenuTexture("background", driver, NULL);
+                       overlay = getMenuTexture("overlay", driver, NULL);
+                       header = getMenuTexture("header", driver, NULL);
+                       footer = getMenuTexture("footer", driver, NULL);
+               }
+       }
+};
+
+void drawMenuBackground(video::IVideoDriver* driver, const MenuTextures &menutextures)
+{
+       v2u32 screensize = driver->getScreenSize();
+       video::ITexture *texture = menutextures.background;
+
+       /* 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 MenuTextures &menutextures)
+{
+       v2u32 screensize = driver->getScreenSize();
+       video::ITexture *texture = menutextures.overlay;
+
+       /* 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);
+}
+
+void drawMenuHeader(video::IVideoDriver* driver, const MenuTextures &menutextures)
 {
        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),
+       video::ITexture *texture = menutextures.header;
+
+       /* If no texture, draw nothing */
+       if(!texture)
+               return;
+
+       f32 mult = (((f32)screensize.Width / 2)) /
+               ((f32)texture->getOriginalSize().Width);
+
+       v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult,
+                       ((f32)texture->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(texture, splashrect,
+                       core::rect<s32>(core::position2d<s32>(0,0),
+                       core::dimension2di(texture->getSize())),
                        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,
+void drawMenuFooter(video::IVideoDriver* driver, const MenuTextures &menutextures)
+{
+       core::dimension2d<u32> screensize = driver->getScreenSize();
+       video::ITexture *texture = menutextures.footer;
+
+       /* If no texture, draw nothing */
+       if(!texture)
+               return;
+
+       f32 mult = (((f32)screensize.Width)) /
+               ((f32)texture->getOriginalSize().Width);
+
+       v2s32 footersize(((f32)texture->getOriginalSize().Width) * mult,
+                       ((f32)texture->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(texture, rect,
                        core::rect<s32>(core::position2d<s32>(0,0),
-                       core::dimension2di(logotexture->getSize())),
+                       core::dimension2di(texture->getSize())),
                        NULL, NULL, true);
        }
 }
 
-#endif
+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.
 // Can't change them to volatile.
@@ -700,14 +891,14 @@ void SpeedTests()
        }
 
        {
-               TimeTaker timer("Testing core::map speed");
+               TimeTaker timer("Testing std::map speed");
                
-               core::map<v2s16, f32> map1;
+               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;
                        }
                }
@@ -734,7 +925,7 @@ void SpeedTests()
                        }
                }
                // Do at least 10ms
-               while(timer.getTime() < 10);
+               while(timer.getTimerTime() < 10);
 
                u32 dtime = timer.stop();
                u32 per_ms = n / dtime;
@@ -788,48 +979,50 @@ int main(int argc, char *argv[])
        */
        
        // 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) ('list' lists all)")));
-       allowed_options.insert("worldname", ValueSpec(VALUETYPE_STRING,
-                       _("Set world by name (implies local game)")));
-       allowed_options.insert("info", ValueSpec(VALUETYPE_FLAG,
-                       _("Print more information to console")));
-       allowed_options.insert("verbose", ValueSpec(VALUETYPE_FLAG,
-                       _("Print even more information to console")));
-       allowed_options.insert("trace", ValueSpec(VALUETYPE_FLAG,
-                       _("Print enormous amounts of information to log and console")));
-       allowed_options.insert("logfile", ValueSpec(VALUETYPE_STRING,
-                       _("Set logfile path ('' = no logging)")));
-       allowed_options.insert("gameid", ValueSpec(VALUETYPE_STRING,
-                       _("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("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)"))));
 #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;
@@ -839,20 +1032,20 @@ int main(int argc, char *argv[])
        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++)
+               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>");
                        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;
                }
 
@@ -915,7 +1108,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
@@ -953,7 +1146,7 @@ int main(int argc, char *argv[])
        }
        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
@@ -1279,6 +1472,14 @@ int main(int argc, char *argv[])
                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 "
@@ -1287,11 +1488,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();
@@ -1334,6 +1588,7 @@ int main(int argc, char *argv[])
        {
                dstream<<"Running speed tests"<<std::endl;
                SpeedTests();
+               device->drop();
                return 0;
        }
        
@@ -1385,6 +1640,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
        */
@@ -1409,7 +1677,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
@@ -1462,6 +1732,12 @@ int main(int argc, char *argv[])
                                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.selected_game_name = findSubgame(menudata.selected_game).name;
+                               }
                                menudata.address = narrow_to_wide(address);
                                menudata.name = narrow_to_wide(playername);
                                menudata.port = narrow_to_wide(itos(port));
@@ -1478,6 +1754,7 @@ int main(int argc, char *argv[])
                                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");
@@ -1514,11 +1791,22 @@ int main(int argc, char *argv[])
                                }
                                // 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);
+
+                               MenuTextures menutextures;
+                               menutextures.update(driver, menugame, menudata.selected_tab);
 
                                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)
                                        {
@@ -1526,7 +1814,7 @@ int main(int argc, char *argv[])
                                                        break;
                                                driver->beginScene(true, true,
                                                                video::SColor(255,128,128,128));
-                                               drawMenuBackground(driver);
+                                               drawMenuBackground(driver, menutextures);
                                                guienv->drawAll();
                                                driver->endScene();
                                                // On some computers framerate doesn't seem to be
@@ -1552,6 +1840,21 @@ int main(int argc, char *argv[])
                                                error_message = L"";
                                        }
 
+                                       // Time is in milliseconds, for clouds
+                                       u32 lasttime = device->getTimer()->getTime();
+
+                                       MenuMusicFetcher soundfetcher;
+                                       ISoundManager *sound = NULL;
+#if USE_SOUND
+                                       sound = createOpenALSoundManager(&soundfetcher);
+#endif
+                                       if(!sound)
+                                               sound = &dummySoundManager;
+                                       SimpleSoundSpec spec;
+                                       spec.name = "main_menu";
+                                       spec.gain = 1;
+                                       s32 handle = sound->playSound(spec, true);
+
                                        infostream<<"Created main menu"<<std::endl;
 
                                        while(device->run() && kill == false)
@@ -1559,26 +1862,97 @@ int main(int argc, char *argv[])
                                                if(menu->getStatus() == true)
                                                        break;
 
-                                               //driver->beginScene(true, true, video::SColor(255,0,0,0));
-                                               driver->beginScene(true, true, video::SColor(255,128,128,128));
+                                               // Game can be selected in the menu
+                                               menugame = getMenuGame(menudata);
+                                               menutextures.update(driver, menugame, menu->getTab());
+                                               // 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 && menutextures.background &&
+                                                                       !menutextures.overlay){
+                                                               cloud_menu_background = false;
+                                                       }
+                                                       // If game game has overlay and no regular background, always draw clouds
+                                                       else if(menutextures.overlay && !menutextures.background){
+                                                               cloud_menu_background = true;
+                                                       }
+                                               }
 
-                                               drawMenuBackground(driver);
+                                               // Time calc for the clouds
+                                               f32 dtime=0; // 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
+                                                       g_menuclouds->step(dtime*3); 
+                                                       g_menuclouds->render();
+                                                       g_menucloudsmgr->drawAll();
+                                                       drawMenuOverlay(driver, menutextures);
+                                                       drawMenuHeader(driver, menutextures);
+                                                       drawMenuFooter(driver, menutextures);
+                                               } else {
+                                                       drawMenuBackground(driver, menutextures);
+                                                       drawMenuHeader(driver, menutextures);
+                                                       drawMenuFooter(driver, menutextures);
+                                               }
 
                                                guienv->drawAll();
-                                               
+
                                                driver->endScene();
                                                
                                                // On some computers framerate doesn't seem to be
                                                // automatically limited
-                                               sleep_ms(25);
+                                               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);
+                                               }
+                                       }
+                                       sound->stopSound(handle);
+                                       if(sound != &dummySoundManager){
+                                               delete sound;
+                                               sound = NULL;
                                        }
-                                       
+
+                                       // Save controls status
+                                       menu->readInput(&menudata);
+
                                        infostream<<"Dropping main menu"<<std::endl;
 
                                        menu->drop();
                                }
 
                                playername = wide_to_narrow(menudata.name);
+                               if (playername == "")
+                                       playername = std::string("Guest") + itos(myrand_range(1000,9999));
                                password = translatePassword(playername, menudata.password);
                                //infostream<<"Main: password hash: '"<<password<<"'"<<std::endl;
 
@@ -1589,6 +1963,8 @@ int main(int argc, char *argv[])
                                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));
@@ -1602,6 +1978,7 @@ int main(int argc, char *argv[])
                                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));
@@ -1665,6 +2042,7 @@ int main(int argc, char *argv[])
                                                continue;
                                        }
                                        g_settings->set("selected_world_path", path);
+                                       g_settings->set("selected_mainmenu_game", menudata.create_world_gameid);
                                        continue;
                                }
 
@@ -1730,6 +2108,7 @@ int main(int argc, char *argv[])
                                gamespec,
                                simple_singleplayer_mode
                        );
+                       smgr->clear();
 
                } //try
                catch(con::PeerNotFoundException &e)
@@ -1737,16 +2116,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)
                {
@@ -1770,6 +2139,10 @@ int main(int argc, char *argv[])
                }
        } // Menu-game loop
        
+       
+       g_menuclouds->drop();
+       g_menucloudsmgr->drop();
+       
        delete input;
 
        /*
@@ -1777,6 +2150,10 @@ int main(int argc, char *argv[])
        */
        device->drop();
 
+#if USE_FREETYPE
+       font->drop();
+#endif
+
 #endif // !SERVER
        
        // Update configuration file