Add curl, freetype and luaJIT to CMAKE_BUILD_INFO

[dragonfireclient.git] / src / content_abm.cpp

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 2501a3a321e088581fb07188da879e425f1429cf..fa6a128eb68db0eb68203283fede129a79c48871 100644 (file)
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "treegen.h" // For treegen::make_tree
 #include "main.h" // for g_settings
 #include "map.h"
-#include "cpp_api/scriptapi.h"
+#include "scripting_game.h"
 #include "log.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
@@ -253,13 +253,14 @@ 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
-                       if (heat <= -1 && (heat <= -50 || ((myrand_range(-50, heat)) <= -30))) {
+                       content_t c = map->getNodeNoEx(p - v3s16(0,  -1, 0 )).getContent(); // top
+                       //more chance to freeze if air at top
+                       if (heat <= -1 && (heat <= -50 || (myrand_range(-50, heat) <= (c == CONTENT_AIR ? -10 : -40)))) {
                                content_t c_self = n.getContent();
                                // making freeze not annoying, do not freeze random blocks in center of ocean
                                // todo: any block not water (dont freeze _source near _flowing)
-                               content_t c;
                                bool allow = heat < -40;
                                // todo: make for(...)
                                if (!allow) {
@@ -314,8 +315,9 @@ class LiquidMeltWeather : public ActiveBlockModifier {
                        ServerMap *map = &env->getServerMap();
                        INodeDefManager *ndef = env->getGameDef()->ndef();
 
-                       float heat = map->getHeat(env, p);
-                       if (heat >= 1 && (heat >= 40 || ((myrand_range(heat, 40)) >= 20))) {
+                       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);
                                map->addNodeWithEvent(p, n);
                                env->getScriptIface()->node_falling_update(p);
@@ -376,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));
                }