mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-04 10:34:01 +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-08-29 02:59:20 +01:00
commit 8c8ed1ee90
1 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Aquaria/ScriptInterface.cpp
View file

@ -2177,6 +2177,20 @@ luaFunc(shot_setTrailPrt)
luaReturnNil(); luaReturnNil();
} }
luaFunc(shot_setTargetPoint)
{
Shot *shot = getShot(L);
if (shot)
shot->setTargetPoint(lua_tointeger(L, 2));
luaReturnNil();
}
luaFunc(shot_getTargetPoint)
{
Shot *shot = getShot(L);
luaReturnInt(shot ? shot->targetPt : 0);
}
luaFunc(entity_setVel) luaFunc(entity_setVel)
{ {
Entity *e = entity(L); Entity *e = entity(L);
@ -2502,6 +2516,12 @@ luaFunc(entity_setTargetPriority)
luaReturnNil(); luaReturnNil();
} }
luaFunc(entity_getTargetPriority)
{
Entity *e = entity(L);
luaReturnInt(e ? e->targetPriority : 0);
}
luaFunc(isQuitFlag) luaFunc(isQuitFlag)
{ {
luaReturnBool(dsq->isQuitFlag()); luaReturnBool(dsq->isQuitFlag());
@ -5675,7 +5695,7 @@ luaFunc(entity_doCollisionAvoidance)
Entity *e = entity(L); Entity *e = entity(L);
bool ret = false; bool ret = false;
int useVel2 = lua_tonumber(L, 6); bool useVel2 = getBool(L, 6);
bool onlyVP = getBool(L, 7); bool onlyVP = getBool(L, 7);
int ignoreObs = lua_tointeger(L, 8); int ignoreObs = lua_tointeger(L, 8);
@ -5876,6 +5896,12 @@ luaFunc(entity_setTargetRange)
luaReturnNil(); luaReturnNil();
} }
luaFunc(entity_getTargetRange)
{
Entity *e = entity(L);
luaReturnInt(e ? e->getTargetRange() : 0);
}
luaFunc(entity_clearTargetPoints) luaFunc(entity_clearTargetPoints)
{ {
Entity *e = entity(L); Entity *e = entity(L);
@ -7565,6 +7591,18 @@ luaFunc(getInputMode)
luaReturnInt(dsq->inputMode); luaReturnInt(dsq->inputMode);
} }
luaFunc(getJoystickAxisLeft)
{
Vector v = core->joystick.position;
luaReturnVec2(v.x, v.y);
}
luaFunc(getJoystickAxisRight)
{
Vector v = core->joystick.rightStick;
luaReturnVec2(v.x, v.y);
}
luaFunc(quit) luaFunc(quit)
{ {
#ifdef AQUARIA_DEMO #ifdef AQUARIA_DEMO
@ -8486,6 +8524,7 @@ static const struct {
luaRegister(entity_getNumTargetPoints), luaRegister(entity_getNumTargetPoints),
luaRegister(entity_setTargetRange), luaRegister(entity_setTargetRange),
luaRegister(entity_getTargetRange),
luaRegister(bone_addSegment), luaRegister(bone_addSegment),
@ -8528,6 +8567,8 @@ static const struct {
luaRegister(disableInput), luaRegister(disableInput),
luaRegister(getInputMode), luaRegister(getInputMode),
luaRegister(getJoystickAxisLeft),
luaRegister(getJoystickAxisRight),
luaRegister(setMousePos), luaRegister(setMousePos),
luaRegister(getMousePos), luaRegister(getMousePos),
@ -8615,6 +8656,7 @@ static const struct {
luaRegister(entity_stopTimer), luaRegister(entity_stopTimer),
luaRegister(entity_stopPull), luaRegister(entity_stopPull),
luaRegister(entity_setTargetPriority), luaRegister(entity_setTargetPriority),
luaRegister(entity_getTargetPriority),
luaRegister(entity_setEntityType), luaRegister(entity_setEntityType),
luaRegister(entity_getEntityType), luaRegister(entity_getEntityType),
@ -8981,6 +9023,8 @@ static const struct {
luaRegister(shot_setCheckDamageTarget), luaRegister(shot_setCheckDamageTarget),
luaRegister(shot_isCheckDamageTarget), luaRegister(shot_isCheckDamageTarget),
luaRegister(shot_setTrailPrt), luaRegister(shot_setTrailPrt),
luaRegister(shot_setTargetPoint),
luaRegister(shot_getTargetPoint),
luaRegister(entity_pathBurst), luaRegister(entity_pathBurst),
luaRegister(entity_handleShotCollisions), luaRegister(entity_handleShotCollisions),
luaRegister(entity_handleShotCollisionsSkeletal), luaRegister(entity_handleShotCollisionsSkeletal),