Item entities: Don't show description as infotext
authorparamat <mat.gregory@virginmedia.com>
Mon, 16 May 2016 23:22:27 +0000 (00:22 +0100)
committerparamat <mat.gregory@virginmedia.com>
Sun, 22 May 2016 07:21:44 +0000 (08:21 +0100)
Partially reverts #3547
Infotext remains optional for objects, empty by default

builtin/game/item_entity.lua

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