diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-16 17:42:13 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-02-17 09:09:50 +0100 |
| commit | f8d5af753617d502920556cff88f451ef670c210 (patch) | |
| tree | 885cb89cd4671e9a55a4d5e7246801748f2f848b /src/script | |
| parent | 98d80e2012ab4856b8b443ef498297e3d3eadbaa (diff) | |
| download | minetest-f8d5af753617d502920556cff88f451ef670c210.tar.gz minetest-f8d5af753617d502920556cff88f451ef670c210.tar.bz2 minetest-f8d5af753617d502920556cff88f451ef670c210.zip | |
SAO work: ActiveObject types & SAO cleanup * Replace u8 types with ActiveObjectType. * Merge content_object.h into activeobject.h * Remove DummyLoadSAO, it's now unused. * Remove ItemSAO, it's also unused
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/lua_api/l_env.cpp | 13 | ||||
| -rw-r--r-- | src/script/lua_api/l_object.cpp | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index 2445803d7..505faa09d 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -406,19 +406,6 @@ int ModApiEnvMod::l_add_item(lua_State *L) script_error(L); lua_remove(L, errorhandler); // Remove error handler return 1; - /*lua_pushvalue(L, 1); - lua_pushstring(L, "__builtin:item"); - lua_pushstring(L, item.getItemString().c_str()); - return l_add_entity(L);*/ - /*// Do it - ServerActiveObject *obj = createItemSAO(env, pos, item.getItemString()); - int objectid = env->addActiveObject(obj); - // If failed to add, return nothing (reads as nil) - if(objectid == 0) - return 0; - // Return ObjectRef - objectrefGetOrCreate(L, obj); - return 1;*/ } // get_player_by_name(name) diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index 4286840fe..e048d072f 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "tool.h" #include "serverobject.h" -#include "content_object.h" #include "content_sao.h" #include "server.h" #include "hud.h" |