minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Item entities: Don't show description as infotext 

Partially reverts #3547
Infotext remains optional for objects, empty by default
This commit is contained in:
paramat 2016-05-17 00:22:27 +01:00
parent 88acda0256
commit 643ac9dd7a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/game/item_entity.lua
View File

@ -31,7 +31,6 @@ core.register_entity(":__builtin:item", {
spritediv = {x = 1, y = 1}, spritediv = {x = 1, y = 1},
initial_sprite_basepos = {x = 0, y = 0}, initial_sprite_basepos = {x = 0, y = 0},
is_visible = false, is_visible = false,
infotext = "",
}, },
itemstring = '', itemstring = '',
@ -51,7 +50,6 @@ core.register_entity(":__builtin:item", {
local c = s local c = s
local itemtable = stack:to_table() local itemtable = stack:to_table()
local itemname = nil local itemname = nil
local description = ""
if itemtable then if itemtable then
itemname = stack:to_table().name itemname = stack:to_table().name
end end
@ -60,7 +58,6 @@ core.register_entity(":__builtin:item", {
if core.registered_items[itemname] then if core.registered_items[itemname] then
item_texture = core.registered_items[itemname].inventory_image item_texture = core.registered_items[itemname].inventory_image
item_type = core.registered_items[itemname].type item_type = core.registered_items[itemname].type
description = core.registered_items[itemname].description
end end
local prop = { local prop = {
is_visible = true, is_visible = true,
@ -69,7 +66,6 @@ core.register_entity(":__builtin:item", {
visual_size = {x = s, y = s}, visual_size = {x = s, y = s},
collisionbox = {-c, -c, -c, c, c, c}, collisionbox = {-c, -c, -c, c, c, c},
automatic_rotate = math.pi * 0.5, automatic_rotate = math.pi * 0.5,
infotext = description,
} }
self.object:set_properties(prop) self.object:set_properties(prop)
end, end,