X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fenvironment.cpp;h=06f2b8bf9d9ad80892e13294fe11736ce1479fcf;hb=b3b075ea02034306256b486dd45410aa765f035a;hp=ac7b7ce693e726df0f6332894dd28823b7eaaf4e;hpb=325bf680410e8012394e5f3ba5ba947c69034899;p=dragonfireclient.git

diff --git a/src/environment.cpp b/src/environment.cpp
index ac7b7ce69..06f2b8bf9 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "collision.h"
 #include "raycast.h"
-#include "serverobject.h"
 #include "scripting_server.h"
 #include "server.h"
 #include "daynightratio.h"
@@ -37,6 +36,7 @@ Environment::Environment(IGameDef *gamedef):
 	m_cache_active_block_mgmt_interval = g_settings->getFloat("active_block_mgmt_interval");
 	m_cache_abm_interval = g_settings->getFloat("abm_interval");
 	m_cache_nodetimer_interval = g_settings->getFloat("nodetimer_interval");
+	m_cache_abm_time_budget = g_settings->getFloat("abm_time_budget");
 
 	m_time_of_day = g_settings->getU32("world_start_time");
 	m_time_of_day_f = (float)m_time_of_day / 24000.0f;
@@ -83,6 +83,24 @@ float Environment::getTimeOfDayF()
 	return m_time_of_day_f;
 }
 
+bool Environment::line_of_sight(v3f pos1, v3f pos2, v3s16 *p)
+{
+	// Iterate trough nodes on the line
+	voxalgo::VoxelLineIterator iterator(pos1 / BS, (pos2 - pos1) / BS);
+	do {
+		MapNode n = getMap().getNode(iterator.m_current_node_pos);
+
+		// Return non-air
+		if (n.param0 != CONTENT_AIR) {
+			if (p)
+				*p = iterator.m_current_node_pos;
+			return false;
+		}
+		iterator.next();
+	} while (iterator.m_current_index <= iterator.m_last_index);
+	return true;
+}
+
 /*
 	Check if a node is pointable
 */
@@ -159,7 +177,7 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result)
 			v3s16 np(x, y, z);
 			bool is_valid_position;
 
-			n = map.getNodeNoEx(np, &is_valid_position);
+			n = map.getNode(np, &is_valid_position);
 			if (!(is_valid_position && isPointableNode(n, nodedef,
 					state->m_liquids_pointable))) {
 				continue;