FIx wrong error message on invalid use of the formspec element image_button

[dragonfireclient.git] / src / content_abm.cpp

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 6e2d438fdbc32971fbf3b401d3cc855143b82c69..ada20a27c4471e530aced061403de14c63fdfb97 100644 (file)
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -209,7 +209,7 @@ class LiquidDropABM : public ActiveBlockModifier {
                { return contents; }
                virtual std::set<std::string> getRequiredNeighbors() {
                        std::set<std::string> neighbors;
-                       neighbors.insert("mapgen_air");
+                       neighbors.insert("air");
                        return neighbors;
                }
                virtual float getTriggerInterval()
@@ -241,7 +241,7 @@ class LiquidFreeze : public ActiveBlockModifier {
                }
                virtual std::set<std::string> getRequiredNeighbors() {
                        std::set<std::string> s;
-                       s.insert("mapgen_air");
+                       s.insert("air");
                        s.insert("group:melts");
                        return s;
                }
@@ -253,7 +253,7 @@ class LiquidFreeze : public ActiveBlockModifier {
                        ServerMap *map = &env->getServerMap();
                        INodeDefManager *ndef = env->getGameDef()->ndef();
 
-                       float heat = map->getHeat(env, p);
+                       float heat = map->updateBlockHeat(env, p);
                        //heater = rare
                        content_t c = map->getNodeNoEx(p - v3s16(0,  -1, 0 )).getContent(); // top
                        //more chance to freeze if air at top
@@ -303,7 +303,7 @@ class LiquidMeltWeather : public ActiveBlockModifier {
                }
                virtual std::set<std::string> getRequiredNeighbors() {
                        std::set<std::string> s;
-                       s.insert("mapgen_air");
+                       s.insert("air");
                        s.insert("group:freezes");
                        return s;
                }
@@ -315,7 +315,7 @@ class LiquidMeltWeather : public ActiveBlockModifier {
                        ServerMap *map = &env->getServerMap();
                        INodeDefManager *ndef = env->getGameDef()->ndef();
 
-                       float heat = map->getHeat(env, p);
+                       float heat = map->updateBlockHeat(env, p);
                        content_t c = map->getNodeNoEx(p - v3s16(0,  -1, 0 )).getContent(); // top
                        if (heat >= 1 && (heat >= 40 || ((myrand_range(heat, 40)) >= (c == CONTENT_AIR ? 10 : 20)))) {
                                n.freezeMelt(ndef);
@@ -378,7 +378,7 @@ void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef) {
                env->addActiveBlockModifier(new LiquidDropABM(env, nodedef));
                env->addActiveBlockModifier(new LiquidMeltHot(env, nodedef));
                //env->addActiveBlockModifier(new LiquidMeltAround(env, nodedef));
-               if (g_settings->getBool("weather")) {
+               if (env->m_use_weather) {
                        env->addActiveBlockModifier(new LiquidFreeze(env, nodedef));
                        env->addActiveBlockModifier(new LiquidMeltWeather(env, nodedef));
                }