Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Show infotext with description for item entities
  • Loading branch information
RealBadAngel authored and paramat committed Jan 18, 2016
1 parent eb6e2c1 commit 87291ea
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 2 deletions.
4 changes: 4 additions & 0 deletions builtin/game/item_entity.lua
Expand Up @@ -31,6 +31,7 @@ core.register_entity(":__builtin:item", {
spritediv = {x = 1, y = 1},
initial_sprite_basepos = {x = 0, y = 0},
is_visible = false,
infotext = "",
},

itemstring = '',
Expand All @@ -50,6 +51,7 @@ 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
Expand All @@ -58,6 +60,7 @@ 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,
Expand All @@ -66,6 +69,7 @@ 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,
Expand Down
1 change: 1 addition & 0 deletions doc/lua_api.txt
Expand Up @@ -3241,6 +3241,7 @@ Definition tables
backface_culling = true, -- false to disable backface_culling for model
nametag = "", -- by default empty, for players their name is shown if empty
nametag_color = <color>, -- sets color of nametag as ColorSpec
infotext = "", -- by default empty, text to be shown when pointed at object
}

### Entity definition (`register_entity`)
Expand Down
5 changes: 5 additions & 0 deletions src/content_cao.h
Expand Up @@ -201,6 +201,11 @@ class GenericCAO : public ClientActiveObject
float time_from_last_punch=1000000);

std::string debugInfoText();

std::string infoText()
{
return m_prop.infotext;
}
};


Expand Down
7 changes: 5 additions & 2 deletions src/game.cpp
Expand Up @@ -3732,8 +3732,11 @@ void Game::handlePointingAtObject(GameRunData *runData,
{
infotext = utf8_to_wide(runData->selected_object->infoText());

if (infotext == L"" && show_debug) {
infotext = utf8_to_wide(runData->selected_object->debugInfoText());
if (show_debug) {
if (infotext != L"") {
infotext += L"\n";
}
infotext += utf8_to_wide(runData->selected_object->debugInfoText());
}

if (input->getLeftState()) {
Expand Down
2 changes: 2 additions & 0 deletions src/object_properties.cpp
Expand Up @@ -118,6 +118,7 @@ void ObjectProperties::serialize(std::ostream &os) const
os << serializeString(nametag);
writeARGB8(os, nametag_color);
writeF1000(os, automatic_face_movement_max_rotation_per_sec);
os << serializeString(infotext);

// Add stuff only at the bottom.
// Never remove anything, because we don't want new versions of this
Expand Down Expand Up @@ -159,6 +160,7 @@ void ObjectProperties::deSerialize(std::istream &is)
nametag = deSerializeString(is);
nametag_color = readARGB8(is);
automatic_face_movement_max_rotation_per_sec = readF1000(is);
infotext = deSerializeString(is);
}catch(SerializationError &e){}
}
else
Expand Down
1 change: 1 addition & 0 deletions src/object_properties.h
Expand Up @@ -51,6 +51,7 @@ struct ObjectProperties
std::string nametag;
video::SColor nametag_color;
f32 automatic_face_movement_max_rotation_per_sec;
std::string infotext;

ObjectProperties();
std::string dump();
Expand Down
3 changes: 3 additions & 0 deletions src/script/common/c_content.cpp
Expand Up @@ -216,6 +216,7 @@ void read_object_properties(lua_State *L, int index,
prop->automatic_face_movement_max_rotation_per_sec = luaL_checknumber(L, -1);
}
lua_pop(L, 1);
getstringfield(L, -1, "infotext", prop->infotext);
}

/******************************************************************************/
Expand Down Expand Up @@ -282,6 +283,8 @@ void push_object_properties(lua_State *L, ObjectProperties *prop)
lua_setfield(L, -2, "nametag_color");
lua_pushnumber(L, prop->automatic_face_movement_max_rotation_per_sec);
lua_setfield(L, -2, "automatic_face_movement_max_rotation_per_sec");
lua_pushlstring(L, prop->infotext.c_str(), prop->infotext.size());
lua_setfield(L, -2, "infotext");
}

/******************************************************************************/
Expand Down

0 comments on commit 87291ea

Please sign in to comment.