Added ClientObjectRef:get_hp()

diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 56ba8e0ec7c0d73b0c4955a2de91fcdbb2915497..75882a07496ff030089ef6104c2fc97aff896387 100644 (file)
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -178,6 +178,11 @@ class GenericCAO : public ClientActiveObject
        {
                return m_velocity;
        }
+       
+       inline const u16 getHp() const
+       {
+               return m_hp;
+       }
 
        const bool isImmortal();
 

diff --git a/src/script/lua_api/l_clientobject.cpp b/src/script/lua_api/l_clientobject.cpp
index 05b3e28503001f736b4cc3814d7959ba4f1e2ebf..70151ba402278d71939d093f618c7f1ee784360c 100644 (file)
--- a/src/script/lua_api/l_clientobject.cpp
+++ b/src/script/lua_api/l_clientobject.cpp
@@ -133,6 +133,14 @@ int ClientObjectRef::l_get_item_textures(lua_State *L)
        return 1;
 }
 
+int ClientObjectRef::l_get_hp(lua_State *L)
+{
+       ClientObjectRef *ref = checkobject(L, 1);
+       GenericCAO *gcao = get_generic_cao(ref, L);
+       lua_pushnumber(L, gcao->getHp());
+       return 1;
+}
+
 int ClientObjectRef::l_get_max_hp(lua_State *L)
 {
        ClientObjectRef *ref = checkobject(L, 1);
@@ -223,5 +231,6 @@ luaL_Reg ClientObjectRef::methods[] = {luamethod(ClientObjectRef, get_pos),
                luamethod(ClientObjectRef, get_attach),
                luamethod(ClientObjectRef, get_nametag),
                luamethod(ClientObjectRef, get_item_textures),
+               luamethod(ClientObjectRef, get_hp),
                luamethod(ClientObjectRef, get_max_hp), luamethod(ClientObjectRef, punch),
                luamethod(ClientObjectRef, rightclick), {0, 0}};

diff --git a/src/script/lua_api/l_clientobject.h b/src/script/lua_api/l_clientobject.h
index a4516e04749b9700a7cd739bb6b541cec2d7505e..d622dc3b2837c9ec5f96182c91a4bdacc87d2848 100644 (file)
--- a/src/script/lua_api/l_clientobject.h
+++ b/src/script/lua_api/l_clientobject.h
@@ -77,6 +77,9 @@ class ClientObjectRef : public ModApiBase
        static int l_get_item_textures(lua_State *L);
 
        // get_hp(self)
+       static int l_get_hp(lua_State *L);
+
+       // get_max_hp(self)
        static int l_get_max_hp(lua_State *L);
 
        // punch(self)