Fix formspec field labels

[dragonfireclient.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index 68bd12b97b72d65b3b29e9ca11b7c5deea50d206..cc5d3d81d056600056305225457068374b4d6061 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -69,6 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iomanip>
 #include <list>
 #include "util/directiontables.h"
+#include "util/pointedthing.h"
 
 /*
        Text input system
@@ -815,44 +816,6 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
                services->setPixelShaderConstant("eyePosition", (irr::f32*)&eye_position, 3);
                services->setVertexShaderConstant("eyePosition", (irr::f32*)&eye_position, 3);
 
-               float enable_bumpmapping = 0;
-               if (g_settings->getBool("enable_bumpmapping"))
-                       enable_bumpmapping = 1;
-               services->setPixelShaderConstant("enableBumpmapping", &enable_bumpmapping, 1);
-
-               float enable_parallax_occlusion = 0;
-               if (g_settings->getBool("enable_parallax_occlusion")) {
-                       enable_parallax_occlusion = 1;
-                       float parallax_occlusion_scale = g_settings->getFloat("parallax_occlusion_scale");
-                       services->setPixelShaderConstant("parallaxOcclusionScale", &parallax_occlusion_scale, 1);
-                       float parallax_occlusion_bias = g_settings->getFloat("parallax_occlusion_bias");
-                       services->setPixelShaderConstant("parallaxOcclusionBias", &parallax_occlusion_bias, 1);
-               }
-               services->setPixelShaderConstant("enableParallaxOcclusion", &enable_parallax_occlusion, 1);
-
-               float enable_waving_water = 0;
-               if (g_settings->getBool("enable_waving_water")){
-                       enable_waving_water = 1;
-                       float water_wave_height_f = g_settings->getFloat("water_wave_height");
-                       services->setVertexShaderConstant("waterWaveHeight", &water_wave_height_f, 1);
-                       float water_wave_length_f = g_settings->getFloat("water_wave_length");
-                       services->setVertexShaderConstant("waterWaveLength", &water_wave_length_f, 1);
-                       float water_wave_speed_f = g_settings->getFloat("water_wave_speed");
-                       services->setVertexShaderConstant("waterWaveSpeed", &water_wave_speed_f, 1);
-               }
-               services->setVertexShaderConstant("enableWavingWater", &enable_waving_water, 1);
-
-               float enable_waving_leaves = 0;
-               if (g_settings->getBool("enable_waving_leaves"))
-                       enable_waving_leaves = 1;
-               services->setVertexShaderConstant("enableWavingLeaves", &enable_waving_leaves, 1);
-
-               float enable_waving_plants = 0;
-               if (g_settings->getBool("enable_waving_plants"))
-                       enable_waving_plants = 1;
-               services->setVertexShaderConstant("enableWavingPlants", &enable_waving_plants, 1);
-
-
                // Normal map texture layer
                int layer1 = 1;
                int layer2 = 2;
@@ -1245,7 +1208,7 @@ void the_game(
                                server->step(dtime);
                        
                        // End condition
-                       if(client.texturesReceived() &&
+                       if(client.mediaReceived() &&
                                        client.itemdefReceived() &&
                                        client.nodedefReceived()){
                                got_content = true;
@@ -1355,7 +1318,7 @@ void the_game(
        */
 
        Sky *sky = NULL;
-       sky = new Sky(smgr->getRootSceneNode(), smgr, -1);
+       sky = new Sky(smgr->getRootSceneNode(), smgr, -1, client.getEnv().getLocalPlayer());
        
        /*
                A copy of the local inventory
@@ -1460,7 +1423,7 @@ void the_game(
        bool invert_mouse = g_settings->getBool("invert_mouse");
 
        bool respawn_menu_active = false;
-       bool update_wielded_item_trigger = false;
+       bool update_wielded_item_trigger = true;
 
        bool show_hud = true;
        bool show_chat = true;
@@ -2328,10 +2291,6 @@ void the_game(
                                        delete(event.show_formspec.formspec);
                                        delete(event.show_formspec.formname);
                                }
-                               else if(event.type == CE_TEXTURES_UPDATED)
-                               {
-                                       update_wielded_item_trigger = true;
-                               }
                                else if(event.type == CE_SPAWN_PARTICLE)
                                {
                                        LocalPlayer* player = client.getEnv().getLocalPlayer();