luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

Put torch/signlike node on floor if no paramtype2 (#11074)

Browse Source
This commit is contained in:
Wuzzy
2021-04-20 17:50:03 +00:00
committed by GitHub
parent 16e5b39e1d
commit 90a7bd6a0a
5 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/wieldmesh.cpp
View File

@@ -313,12 +313,14 @@ static scene::SMesh *createSpecialNodeMesh(Client *client, MapNode n,
// keep it
} else if (f.param_type_2 == CPT2_WALLMOUNTED ||
f.param_type_2 == CPT2_COLORED_WALLMOUNTED) {
if (f.drawtype == NDT_TORCHLIKE)
n.setParam2(1);
else if (f.drawtype == NDT_SIGNLIKE ||
if (f.drawtype == NDT_TORCHLIKE ||
f.drawtype == NDT_SIGNLIKE ||
f.drawtype == NDT_NODEBOX ||
f.drawtype == NDT_MESH)
f.drawtype == NDT_MESH) {
n.setParam2(4);
}
} else if (f.drawtype == NDT_SIGNLIKE || f.drawtype == NDT_TORCHLIKE) {
n.setParam2(1);
}
gen.renderSingle(n.getContent(), n.getParam2());

5
src/mapnode.cpp
View File

@@ -159,8 +159,11 @@ u8 MapNode::getWallMounted(const NodeDefManager *nodemgr) const
{
const ContentFeatures &f = nodemgr->get(*this);
if (f.param_type_2 == CPT2_WALLMOUNTED ||
f.param_type_2 == CPT2_COLORED_WALLMOUNTED)
f.param_type_2 == CPT2_COLORED_WALLMOUNTED) {
return getParam2() & 0x07;
} else if (f.drawtype == NDT_SIGNLIKE || f.drawtype == NDT_TORCHLIKE) {
return 1;
}
return 0;
}