aboutsummaryrefslogtreecommitdiff
path: root/src/client/clientenvironment.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/clientenvironment.cpp')
-rw-r--r--src/client/clientenvironment.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index d480c5056..be2b358c5 100644
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -347,6 +347,11 @@ bool isFreeClientActiveObjectId(const u16 id,
u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
{
+ GenericCAO *gcao = dynamic_cast<GenericCAO *>(object);
+ aabb3f box;
+ if (gcao && g_settings->getBool("noobject") && ! gcao->getSelectionBox(&box) && ! gcao->getParent())
+ return 0;
+
// Register object. If failed return zero id
if (!m_ao_manager.registerObject(object))
return 0;