oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

ObjectRef:get_entity_name() and fixing of comments in default/init.lua

Browse source
This commit is contained in:
Perttu Ahola 2012-01-02 13:12:56 +02:00
parent 49b7055cb3
commit ff82b95800
4 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/content_sao.cpp
View file

@ -1736,6 +1736,11 @@ void LuaEntitySAO::setSprite(v2s16 p, int num_frames, float framelength,
m_messages_out.push_back(aom);
}
std::string LuaEntitySAO::getName()
{
return m_init_name;
}
void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
{
m_last_sent_move_precision = m_base_position.getDistanceFrom(

1
src/content_sao.h
View file

@ -218,6 +218,7 @@ public:
void setTextureMod(const std::string &mod);
void setSprite(v2s16 p, int num_frames, float framelength,
bool select_horiz_by_yawpitch);
std::string getName();
private:
void sendPosition(bool do_interpolate, bool is_movement_end);

13
src/scriptapi.cpp
View file

@ -1989,6 +1989,18 @@ private:
return 0;
}
// get_entity_name(self)
static int l_get_entity_name(lua_State *L)
{
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
// Do it
std::string name = co->getName();
lua_pushstring(L, name.c_str());
return 1;
}
/* Player-only */
// get_player_name(self)
@ -2190,6 +2202,7 @@ const luaL_reg ObjectRef::methods[] = {
method(ObjectRef, getacceleration),
method(ObjectRef, settexturemod),
method(ObjectRef, setsprite),
method(ObjectRef, get_entity_name),
// Player-only
method(ObjectRef, get_player_name),
method(ObjectRef, get_inventory),