Revert "Fix settings to honor numeric conversion errors"

[dragonfireclient.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index 16fd42f1607699dfe1a630246743c04f6d7044d7..56519d30aa9dbfa40593315c7e028c8fcd239477 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1337,6 +1337,8 @@ void the_game(
 
        Sky *sky = NULL;
        sky = new Sky(smgr->getRootSceneNode(), smgr, -1, client.getEnv().getLocalPlayer());
+
+       scene::ISceneNode* skybox = NULL;
        
        /*
                A copy of the local inventory
@@ -1486,7 +1488,7 @@ void the_game(
        /*
                HUD object
        */
-       Hud hud(driver, guienv, font, text_height,
+       Hud hud(driver, smgr, guienv, font, text_height,
                        gamedef, player, &local_inventory);
 
        bool use_weather = g_settings->getBool("weather");
@@ -2376,6 +2378,7 @@ void the_game(
                                                delete event.hudadd.text;
                                                delete event.hudadd.align;
                                                delete event.hudadd.offset;
+                                               delete event.hudadd.world_pos;
                                                continue;
                                        }
                                        
@@ -2390,6 +2393,7 @@ void the_game(
                                        e->dir    = event.hudadd.dir;
                                        e->align  = *event.hudadd.align;
                                        e->offset = *event.hudadd.offset;
+                                       e->world_pos = *event.hudadd.world_pos;
                                        
                                        if (id == nhudelem)
                                                player->hud.push_back(e);
@@ -2402,6 +2406,7 @@ void the_game(
                                        delete event.hudadd.text;
                                        delete event.hudadd.align;
                                        delete event.hudadd.offset;
+                                       delete event.hudadd.world_pos;
                                }
                                else if (event.type == CE_HUDRM)
                                {
@@ -2415,6 +2420,7 @@ void the_game(
                                {
                                        u32 id = event.hudchange.id;
                                        if (id >= player->hud.size() || !player->hud[id]) {
+                                               delete event.hudchange.v3fdata;
                                                delete event.hudchange.v2fdata;
                                                delete event.hudchange.sdata;
                                                continue;
@@ -2449,11 +2455,55 @@ void the_game(
                                                case HUD_STAT_OFFSET:
                                                        e->offset = *event.hudchange.v2fdata;
                                                        break;
+                                               case HUD_STAT_WORLD_POS:
+                                                       e->world_pos = *event.hudchange.v3fdata;
+                                                       break;
                                        }
                                        
+                                       delete event.hudchange.v3fdata;
                                        delete event.hudchange.v2fdata;
                                        delete event.hudchange.sdata;
                                }
+                               else if (event.type == CE_SET_SKY)
+                               {
+                                       sky->setVisible(false);
+                                       if(skybox){
+                                               skybox->drop();
+                                               skybox = NULL;
+                                       }
+                                       // Handle according to type
+                                       if(*event.set_sky.type == "regular"){
+                                               sky->setVisible(true);
+                                       }
+                                       else if(*event.set_sky.type == "skybox" &&
+                                                       event.set_sky.params->size() == 6){
+                                               sky->setFallbackBgColor(*event.set_sky.bgcolor);
+                                               skybox = smgr->addSkyBoxSceneNode(
+                                                               tsrc->getTexture((*event.set_sky.params)[0]),
+                                                               tsrc->getTexture((*event.set_sky.params)[1]),
+                                                               tsrc->getTexture((*event.set_sky.params)[2]),
+                                                               tsrc->getTexture((*event.set_sky.params)[3]),
+                                                               tsrc->getTexture((*event.set_sky.params)[4]),
+                                                               tsrc->getTexture((*event.set_sky.params)[5]));
+                                       }
+                                       // Handle everything else as plain color
+                                       else {
+                                               if(*event.set_sky.type != "plain")
+                                                       infostream<<"Unknown sky type: "
+                                                                       <<(*event.set_sky.type)<<std::endl;
+                                               sky->setFallbackBgColor(*event.set_sky.bgcolor);
+                                       }
+
+                                       delete event.set_sky.bgcolor;
+                                       delete event.set_sky.type;
+                                       delete event.set_sky.params;
+                               }
+                               else if (event.type == CE_OVERRIDE_DAY_NIGHT_RATIO)
+                               {
+                                       bool enable = event.override_day_night_ratio.do_override;
+                                       u32 value = event.override_day_night_ratio.ratio_f * 1000;
+                                       client.getEnv().setDayNightRatioOverride(enable, value);
+                               }
                        }
                }