mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'experimental' of file:///Users/User/code/coding/Aquaria_fg_clean into experimental

Browse source
This commit is contained in:
fgenesis 2013-09-29 00:27:54 +01:00
commit 7a2219783a
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Aquaria/ScriptInterface.cpp
View file

@ -2435,6 +2435,28 @@ luaFunc(entity_setRidingData)
luaReturnNil(); luaReturnNil();
} }
luaFunc(entity_getRidingPosition)
{
Entity *e = entity(L);
Vector v;
if (e)
v = e->getRidingPosition();
luaReturnVec2(v.x, v.y);
}
luaFunc(entity_getRidingRotation)
{
Entity *e = entity(L);
luaReturnNum(e ? e->getRidingRotation() : 0.0f);
}
luaFunc(entity_getRidingFlip)
{
Entity *e = entity(L);
luaReturnBool(e && e->getRidingFlip());
}
luaFunc(entity_setBoneLock) luaFunc(entity_setBoneLock)
{ {
Entity *e = entity(L); Entity *e = entity(L);
@ -8561,6 +8583,9 @@ static const struct {
luaRegister(entity_setRidingPosition), luaRegister(entity_setRidingPosition),
luaRegister(entity_setRidingData), luaRegister(entity_setRidingData),
luaRegister(entity_getRidingPosition),
luaRegister(entity_getRidingRotation),
luaRegister(entity_getRidingFlip),
luaRegister(entity_setBoneLock), luaRegister(entity_setBoneLock),
luaRegister(entity_setIngredient), luaRegister(entity_setIngredient),
luaRegister(entity_setDeathScene), luaRegister(entity_setDeathScene),