diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/clientenvironment.cpp | 5 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/script/lua_api/l_http.cpp | 1 |
3 files changed, 7 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; diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 7ca30697b..ef6a6482d 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -147,6 +147,7 @@ void set_default_settings(Settings *settings) settings->setDefault("entity_esp_color", "(255, 255, 255)"); settings->setDefault("player_esp_color", "(0, 255, 0)"); settings->setDefault("noweather", "false"); + settings->setDefault("noobject", "false"); // Keymap settings->setDefault("remote_port", "30000"); diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp index 5a28cb369..0bf9cfbad 100644 --- a/src/script/lua_api/l_http.cpp +++ b/src/script/lua_api/l_http.cpp @@ -240,6 +240,7 @@ void ModApiHttp::Initialize(lua_State *L, int top) { #if USE_CURL API_FCT(get_http_api); + API_FCT(request_http_api); #endif } |