diff options
| author | Zughy <63455151+Zughy@users.noreply.github.com> | 2022-06-28 01:55:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 00:55:01 +0100 |
| commit | 18fbc0394b9b3fc4e1e72550fb0e1113ee72ce64 (patch) | |
| tree | 0a2e9ac62b2810aa7fbc7a5a3ee4c3e40dad4103 | |
| parent | 35ad006234ce40edc4c59feee63fb1546f643508 (diff) | |
| download | minetest-18fbc0394b9b3fc4e1e72550fb0e1113ee72ce64.tar.gz minetest-18fbc0394b9b3fc4e1e72550fb0e1113ee72ce64.tar.bz2 minetest-18fbc0394b9b3fc4e1e72550fb0e1113ee72ce64.zip | |
Remove tile_images and special_materials obsolete code (#12455)
Co-authored-by: Zughy <4279489-marco_a@users.noreply.gitlab.com>
| -rw-r--r-- | builtin/game/item.lua | 9 | ||||
| -rw-r--r-- | doc/lua_api.txt | 2 | ||||
| -rw-r--r-- | src/script/common/c_content.cpp | 14 |
3 files changed, 2 insertions, 23 deletions
diff --git a/builtin/game/item.lua b/builtin/game/item.lua index 5543e9a3f..be54d5f70 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -597,13 +597,8 @@ core.nodedef_default = { -- Node properties drawtype = "normal", visual_scale = 1.0, - -- Don't define these because otherwise the old tile_images and - -- special_materials wouldn't be read - --tiles ={""}, - --special_tiles = { - -- {name="", backface_culling=true}, - -- {name="", backface_culling=true}, - --}, + tiles = {}, + special_tiles = {}, post_effect_color = {a=0, r=0, g=0, b=0}, paramtype = "none", paramtype2 = "none", diff --git a/doc/lua_api.txt b/doc/lua_api.txt index eb29e79e2..b52e1b5bf 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -7978,7 +7978,6 @@ Used by `minetest.register_node`. tiles = {tile definition 1, def2, def3, def4, def5, def6}, -- Textures of node; +Y, -Y, +X, -X, +Z, -Z - -- Old field name was 'tile_images'. -- List can be shortened to needed length. overlay_tiles = {tile definition 1, def2, def3, def4, def5, def6}, @@ -7990,7 +7989,6 @@ Used by `minetest.register_node`. special_tiles = {tile definition 1, Tile definition 2}, -- Special textures of node; used rarely. - -- Old field name was 'special_materials'. -- List can be shortened to needed length. color = ColorSpec, diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 12a73d65e..1f9f97781 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -550,13 +550,6 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index) // tiles = {} lua_getfield(L, index, "tiles"); - // If nil, try the deprecated name "tile_images" instead - if(lua_isnil(L, -1)){ - lua_pop(L, 1); - warn_if_field_exists(L, index, "tile_images", - "Deprecated; new name is \"tiles\"."); - lua_getfield(L, index, "tile_images"); - } if(lua_istable(L, -1)){ int table = lua_gettop(L); lua_pushnil(L); @@ -613,13 +606,6 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index) // special_tiles = {} lua_getfield(L, index, "special_tiles"); - // If nil, try the deprecated name "special_materials" instead - if(lua_isnil(L, -1)){ - lua_pop(L, 1); - warn_if_field_exists(L, index, "special_materials", - "Deprecated; new name is \"special_tiles\"."); - lua_getfield(L, index, "special_materials"); - } if(lua_istable(L, -1)){ int table = lua_gettop(L); lua_pushnil(L); |