summaryrefslogtreecommitdiff
path: root/src/client/content_cao.cpp
diff options
context:
space:
mode:
authorAlex <24834740+GreenXenith@users.noreply.github.com>2018-12-10 18:57:04 -0800
committerParamat <paramat@users.noreply.github.com>2018-12-11 02:57:04 +0000
commita833bee9edaeb6df69d1e510759a7b33915a41e0 (patch)
treee316ad0094a27816d89af10fce16ccf125cc90a1 /src/client/content_cao.cpp
parent98fa8a154d8136ad19d723fd89164c9d833da52b (diff)
downloadminetest-a833bee9edaeb6df69d1e510759a7b33915a41e0.tar.gz
minetest-a833bee9edaeb6df69d1e510759a7b33915a41e0.tar.bz2
minetest-a833bee9edaeb6df69d1e510759a7b33915a41e0.zip
Add object visual type 'item' (#7870)
Diffstat (limited to 'src/client/content_cao.cpp')
-rw-r--r--src/client/content_cao.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index db59ae5c5..e2517f7ca 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -662,7 +662,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
}
else
errorstream<<"GenericCAO::addToScene(): Could not load mesh "<<m_prop.mesh<<std::endl;
- } else if (m_prop.visual == "wielditem") {
+ } else if (m_prop.visual == "wielditem" || m_prop.visual == "item") {
ItemStack item;
infostream << "GenericCAO::addToScene(): wielditem" << std::endl;
if (m_prop.wield_item.empty()) {
@@ -680,7 +680,8 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
}
m_wield_meshnode = new WieldMeshSceneNode(
RenderingEngine::get_scene_manager(), -1);
- m_wield_meshnode->setItem(item, m_client);
+ m_wield_meshnode->setItem(item, m_client,
+ (m_prop.visual == "wielditem"));
m_wield_meshnode->setScale(
v3f(m_prop.visual_size.X / 2, m_prop.visual_size.Y / 2,