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

Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean

This commit is contained in:
fgenesis 2012-06-27 22:12:15 +00:00
commit b4e1f91217

View file

@ -7442,7 +7442,6 @@ static const struct {
luaRegister(entity_getVectorToEntity), luaRegister(entity_getVectorToEntity),
luaRegister(entity_getDistanceToTarget), luaRegister(entity_getDistanceToTarget),
{ "entity_delete", l_entity_delete_override },
luaRegister(entity_move), luaRegister(entity_move),
luaRegister(entity_getID), luaRegister(entity_getID),
@ -8075,6 +8074,7 @@ static const struct {
// -- overrides / special cases-- // -- overrides / special cases--
{"bone_getPosition", l_bone_getWorldPosition}, {"bone_getPosition", l_bone_getWorldPosition},
{ "entity_delete", l_entity_delete_override },
// -- deprecated/compatibility related functions below here -- // -- deprecated/compatibility related functions below here --