diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-09-16 22:52:24 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-09-16 23:33:53 -0400 |
| commit | 9bccd75e340d7502251c233418e0afccd9c4a49c (patch) | |
| tree | 18c6760ef94d7a9a2f1a79fc25d65b730a863a49 /src/content_abm.cpp | |
| parent | c9eb17aba32036e3a2cf25166e1ab256d6dd2cb7 (diff) | |
| download | minetest-9bccd75e340d7502251c233418e0afccd9c4a49c.tar.gz minetest-9bccd75e340d7502251c233418e0afccd9c4a49c.tar.bz2 minetest-9bccd75e340d7502251c233418e0afccd9c4a49c.zip | |
Weather: Clean up getHeat/getHumidity somewhat
Diffstat (limited to 'src/content_abm.cpp')
| -rw-r--r-- | src/content_abm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/content_abm.cpp b/src/content_abm.cpp index 6e2d438fd..fa6a128eb 100644 --- a/src/content_abm.cpp +++ b/src/content_abm.cpp @@ -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 @@ -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)); } |