summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-19 11:58:20 +0200
committermadmaxoft <github@xoft.cz>2013-08-19 11:58:20 +0200
commit25e2f721ad2a65d336a83bcaf021d7edb0837125 (patch)
tree8bf8fb6daf741563be804845478269d715417d63
parentAdded cPickup:GetAge() the the Lua API. (diff)
downloadcuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.tar
cuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.tar.gz
cuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.tar.bz2
cuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.tar.lz
cuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.tar.xz
cuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.tar.zst
cuberite-25e2f721ad2a65d336a83bcaf021d7edb0837125.zip
-rw-r--r--source/Bindings.cpp35
-rw-r--r--source/Bindings.h2
-rw-r--r--source/Entities/Pickup.h3
3 files changed, 38 insertions, 2 deletions
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 4e98e984c..9d6b6d959 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/19/13 11:43:38.
+** Generated automatically by tolua++-1.0.92 on 08/19/13 11:57:26.
*/
#ifndef __cplusplus
@@ -18075,6 +18075,38 @@ static int tolua_AllToLua_cPickup_GetAge00(lua_State* tolua_S)
}
#endif //#ifndef TOLUA_DISABLE
+/* method: IsCollected of class cPickup */
+#ifndef TOLUA_DISABLE_tolua_AllToLua_cPickup_IsCollected00
+static int tolua_AllToLua_cPickup_IsCollected00(lua_State* tolua_S)
+{
+#ifndef TOLUA_RELEASE
+ tolua_Error tolua_err;
+ if (
+ !tolua_isusertype(tolua_S,1,"const cPickup",0,&tolua_err) ||
+ !tolua_isnoobj(tolua_S,2,&tolua_err)
+ )
+ goto tolua_lerror;
+ else
+#endif
+ {
+ const cPickup* self = (const cPickup*) tolua_tousertype(tolua_S,1,0);
+#ifndef TOLUA_RELEASE
+ if (!self) tolua_error(tolua_S,"invalid 'self' in function 'IsCollected'", NULL);
+#endif
+ {
+ bool tolua_ret = (bool) self->IsCollected();
+ tolua_pushboolean(tolua_S,(bool)tolua_ret);
+ }
+ }
+ return 1;
+#ifndef TOLUA_RELEASE
+ tolua_lerror:
+ tolua_error(tolua_S,"#ferror in function 'IsCollected'.",&tolua_err);
+ return 0;
+#endif
+}
+#endif //#ifndef TOLUA_DISABLE
+
/* get function: m_PrimaryServerVersion of class cRoot */
#ifndef TOLUA_DISABLE_tolua_get_cRoot_m_PrimaryServerVersion
static int tolua_get_cRoot_m_PrimaryServerVersion(lua_State* tolua_S)
@@ -28432,6 +28464,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
tolua_function(tolua_S,"GetItem",tolua_AllToLua_cPickup_GetItem00);
tolua_function(tolua_S,"CollectedBy",tolua_AllToLua_cPickup_CollectedBy00);
tolua_function(tolua_S,"GetAge",tolua_AllToLua_cPickup_GetAge00);
+ tolua_function(tolua_S,"IsCollected",tolua_AllToLua_cPickup_IsCollected00);
tolua_endmodule(tolua_S);
tolua_cclass(tolua_S,"cRoot","cRoot","",NULL);
tolua_beginmodule(tolua_S,"cRoot");
diff --git a/source/Bindings.h b/source/Bindings.h
index 72a979d0b..4dee7f815 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/19/13 11:43:39.
+** Generated automatically by tolua++-1.0.92 on 08/19/13 11:57:27.
*/
/* Exported function */
diff --git a/source/Entities/Pickup.h b/source/Entities/Pickup.h
index 90292dcb8..b0323dd92 100644
--- a/source/Entities/Pickup.h
+++ b/source/Entities/Pickup.h
@@ -40,6 +40,9 @@ public:
/// Returns the number of ticks that this entity has existed
int GetAge(void) const { return (int)(m_Timer / 50); } // tolua_export
+ /// Returns true if the pickup has already been collected
+ bool IsCollected(void) const { return m_bCollected; } // tolua_export
+
private:
Vector3d m_ResultingSpeed; //Can be used to modify the resulting speed for the current tick ;)