From 9bccd75e340d7502251c233418e0afccd9c4a49c Mon Sep 17 00:00:00 2001 From: kwolekr Date: Mon, 16 Sep 2013 22:52:24 -0400 Subject: Weather: Clean up getHeat/getHumidity somewhat --- src/environment.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/environment.cpp') diff --git a/src/environment.cpp b/src/environment.cpp index 86c98f2c2..03b436890 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -322,6 +322,7 @@ ServerEnvironment::ServerEnvironment(ServerMap *map, m_recommended_send_interval(0.1), m_max_lag_estimate(0.1) { + m_use_weather = g_settings->getBool("weather"); } ServerEnvironment::~ServerEnvironment() @@ -808,6 +809,16 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime) // Activate stored objects activateObjects(block, dtime_s); + + // Calculate weather conditions + if (m_use_weather) { + m_map->updateBlockHeat(this, block->getPos() * MAP_BLOCKSIZE, block); + m_map->updateBlockHumidity(this, block->getPos() * MAP_BLOCKSIZE, block); + } else { + block->heat = HEAT_UNDEFINED; + block->humidity = HUMIDITY_UNDEFINED; + block->weather_update_time = 0; + } // Run node timers std::map elapsed_timers = -- cgit v1.2.3