mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-10 06:04:03 +00:00
Code Issues Releases Wiki Activity

Fix typo in entity_getBoneByInternalId(), add obj_getBlendType()

Browse source
This commit is contained in:
fgenesis 2016-01-10 23:49:11 +01:00
parent f55a70b459
commit 198f0353d5
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Aquaria/ScriptInterface.cpp
View file

@ -1129,6 +1129,12 @@ luaFunc(obj_setBlendType)
luaReturnNil(); luaReturnNil();
} }
luaFunc(obj_getBlendType)
{
RenderObject *r = robj(L);
luaReturnInt(r ? r->blendType : 0);
}
luaFunc(obj_setTexture) luaFunc(obj_setTexture)
{ {
RenderObject *r = robj(L); RenderObject *r = robj(L);
@ -1831,6 +1837,7 @@ luaFunc(quad_getBorderAlpha)
RO_FUNC(getter, prefix, x ) \ RO_FUNC(getter, prefix, x ) \
RO_FUNC(getter, prefix, y ) \ RO_FUNC(getter, prefix, y ) \
RO_FUNC(getter, prefix, setBlendType ) \ RO_FUNC(getter, prefix, setBlendType ) \
RO_FUNC(getter, prefix, getBlendType ) \
RO_FUNC(getter, prefix, setTexture ) \ RO_FUNC(getter, prefix, setTexture ) \
RO_FUNC(getter, prefix, delete ) \ RO_FUNC(getter, prefix, delete ) \
RO_FUNC(getter, prefix, getLife ) \ RO_FUNC(getter, prefix, getLife ) \
@ -6219,12 +6226,8 @@ luaFunc(entity_getBoneByName)
luaFunc(entity_getBoneByInternalId) luaFunc(entity_getBoneByInternalId)
{ {
Entity *e = entity(L); Entity *e = entity(L);
if(!e) size_t i = lua_tointeger(L, 2);
luaReturnPtr(NULL); luaReturnPtr((e && i < e->skeletalSprite.bones.size()) ? e->skeletalSprite.bones[i] : NULL);
size_t i = lua_tointeger(L, 1);
if(i >= e->skeletalSprite.bones.size())
luaReturnPtr(NULL);
luaReturnPtr(e->skeletalSprite.bones[i]);
} }
luaFunc(entity_getNumBones) luaFunc(entity_getNumBones)