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

Make script="x" setting in songs.xml accept other values than boolean.

Browse source 
The value 2 is now used to indicate that both script and internal handler
should be called.
This commit is contained in:
fgenesis 2013-04-22 02:42:53 +02:00
parent ad10db82ad
commit 65b1983c61
3 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Aquaria/Continuity.cpp
View file

@ -1392,6 +1392,10 @@ void Continuity::castSong(int num)
effect->setPositionSnapTo(&dsq->game->avatar->position);
dsq->game->addRenderObject(effect, LR_PARTICLES);
// song->script == 0: internal handler only
// song->script == 1: script handler only
// song->script == 2: both
if (song->script)
{
if (dsq->mod.isActive())
@ -1399,7 +1403,8 @@ void Continuity::castSong(int num)
else
dsq->runScriptNum("songs.lua", "castSong", num);
}
else
if (song->script != 1)
{
switch((SongType)num)
{