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

Fix regression from 7ff0caaed8.

Browse source 
This fixes a glitch in the final boss' last form. Due to a missing
Beam::trace() call, the beam's angle was not updated,
and it always pointed into the upper left corner.
This commit is contained in:
fgenesis 2013-05-02 23:30:06 +02:00
parent 65b1983c61
commit 02f18daed5
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Aquaria/ScriptInterface.cpp
View file

@ -3641,6 +3641,19 @@ luaFunc(beam_setFirer)
luaReturnNil(); luaReturnNil();
} }
// Note the additional trace() call
luaFunc(beam_setPosition_override)
{
Beam *b = beam(L);
if (b)
{
b->position.interpolateTo(Vector(lua_tonumber(L, 2), lua_tonumber(L, 3)),
lua_tonumber(L, 4), lua_tonumber(L, 5), lua_tonumber(L, 6), lua_tonumber(L, 7));
b->trace();
}
luaReturnNil();
}
luaFunc(getStringBank) luaFunc(getStringBank)
{ {
luaReturnStr(dsq->continuity.stringBank.get(lua_tointeger(L, 1)).c_str()); luaReturnStr(dsq->continuity.stringBank.get(lua_tointeger(L, 1)).c_str());
@ -8366,6 +8379,7 @@ static const struct {
{"bone_getPosition", l_bone_getWorldPosition}, {"bone_getPosition", l_bone_getWorldPosition},
{ "entity_delete", l_entity_delete_override }, { "entity_delete", l_entity_delete_override },
{ "entity_setRenderPass", l_entity_setRenderPass_override }, { "entity_setRenderPass", l_entity_setRenderPass_override },
{ "beam_setPosition", l_beam_setPosition_override },
// -- deprecated/compatibility related functions below here -- // -- deprecated/compatibility related functions below here --