mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-10 16:19:59 +00:00
Code Issues Releases Wiki Activity

Fix regression from "Script interface improvements & extensions."

Browse source 
This caused a crash due to an already freed point in Avatar.cpp pull target update.
Thanks to Red Skull for reporting.
This commit is contained in:
fgenesis 2012-06-27 21:57:10 +02:00
parent 38501dca35
commit dff86833ef
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Aquaria/ScriptInterface.cpp
View file

@ -5755,6 +5755,33 @@ luaFunc(entity_pullEntities)
luaReturnNil(); luaReturnNil();
} }
// Note that this overrides the generic obj_delete function for entities.
// (It's registered as "entity_delete" to Lua)
// There is at least one known case where this is necessary:
// Avatar::pullTarget does a life check to drop the pointer;
// If it's instantly deleted, this will cause a crash.
luaFunc(entity_delete_override)
{
Entity *e = entity(L);
if (e)
{
float time = lua_tonumber(L, 2);
if (time == 0)
{
e->alpha = 0;
e->setLife(0);
e->setDecayRate(1);
}
else
{
e->fadeAlphaWithLife = true;
e->setLife(1);
e->setDecayRate(1.0f/time);
}
}
luaReturnInt(0);
}
luaFunc(entity_isRidingOnEntity) luaFunc(entity_isRidingOnEntity)
{ {
Entity *e = entity(L); Entity *e = entity(L);
@ -7415,6 +7442,7 @@ 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),