diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-19 13:09:38 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-19 13:09:38 +0200 |
| commit | f1ff05bf5932a7825509dbe896e60183a96a6d36 (patch) | |
| tree | 73f2e361a7fd8010345880071aa29f0495171879 /src/environment.cpp | |
| parent | 35da7306dcd07fd43252468cdf71c9d8c09faeeb (diff) | |
| download | dragonfireclient-f1ff05bf5932a7825509dbe896e60183a96a6d36.tar.xz | |
Added ThroughWalls, InventoryActions API and AutoTotem
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 599d2f726..7acad313e 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -106,8 +106,10 @@ bool Environment::line_of_sight(v3f pos1, v3f pos2, v3s16 *p) Check if a node is pointable */ inline static bool isPointableNode(const MapNode &n, - const NodeDefManager *nodedef , bool liquids_pointable) + const NodeDefManager *nodedef , bool liquids_pointable, bool nodes_pointable) { + if (! nodes_pointable) + return false; const ContentFeatures &features = nodedef->get(n); return features.pointable || ((liquids_pointable || g_settings->getBool("point_liquids")) && features.isLiquid()); @@ -180,7 +182,7 @@ void Environment::continueRaycast(RaycastState *state, PointedThing *result) n = map.getNode(np, &is_valid_position); if (!(is_valid_position && isPointableNode(n, nodedef, - state->m_liquids_pointable))) { + state->m_liquids_pointable, state->m_nodes_pointable))) { continue; } |