Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove tile_images and special_materials obsolete code (#12455)

Browse Source 
Co-authored-by: Zughy <4279489-marco_a@users.noreply.gitlab.com>
This commit is contained in:
Zughy 2022-06-28 01:55:01 +02:00 committed by GitHub
parent 35ad006234
commit 18fbc0394b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/game/item.lua
View File

@ -597,13 +597,8 @@ core.nodedef_default = {
-- Node properties -- Node properties
drawtype = "normal", drawtype = "normal",
visual_scale = 1.0, visual_scale = 1.0,
-- Don't define these because otherwise the old tile_images and tiles = {},
-- special_materials wouldn't be read special_tiles = {},
--tiles ={""},
--special_tiles = {
-- {name="", backface_culling=true},
-- {name="", backface_culling=true},
--},
post_effect_color = {a=0, r=0, g=0, b=0}, post_effect_color = {a=0, r=0, g=0, b=0},
paramtype = "none", paramtype = "none",
paramtype2 = "none", paramtype2 = "none",

2
doc/lua_api.txt
View File

@ -7978,7 +7978,6 @@ Used by `minetest.register_node`.
tiles = {tile definition 1, def2, def3, def4, def5, def6}, tiles = {tile definition 1, def2, def3, def4, def5, def6},
-- Textures of node; +Y, -Y, +X, -X, +Z, -Z -- Textures of node; +Y, -Y, +X, -X, +Z, -Z
-- Old field name was 'tile_images'.
-- List can be shortened to needed length. -- List can be shortened to needed length.
overlay_tiles = {tile definition 1, def2, def3, def4, def5, def6}, 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_tiles = {tile definition 1, Tile definition 2},
-- Special textures of node; used rarely. -- Special textures of node; used rarely.
-- Old field name was 'special_materials'.
-- List can be shortened to needed length. -- List can be shortened to needed length.
color = ColorSpec, color = ColorSpec,

14
src/script/common/c_content.cpp
View File

@ -550,13 +550,6 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
// tiles = {} // tiles = {}
lua_getfield(L, 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)){ if(lua_istable(L, -1)){
int table = lua_gettop(L); int table = lua_gettop(L);
lua_pushnil(L); lua_pushnil(L);
@ -613,13 +606,6 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
// special_tiles = {} // special_tiles = {}
lua_getfield(L, 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)){ if(lua_istable(L, -1)){
int table = lua_gettop(L); int table = lua_gettop(L);
lua_pushnil(L); lua_pushnil(L);