mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

sync with icculus repo

Browse source
This commit is contained in:
fgenesis 2011-11-20 15:44:17 +01:00
parent 3b39173397
commit e64fb75f84
48 changed files with 21570 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Aquaria/SceneEditor.cpp
View file

@ -2429,15 +2429,19 @@ void SceneEditor::moveElementToLayer(Element *e, int bgLayer)
{
Element *e = selectedElements[i];
core->removeRenderObject(e, Core::DO_NOT_DESTROY_RENDER_OBJECT);
core->addRenderObject(e, LR_ELEMENTS1+bgLayer);
dsq->removeElement(e);
e->bgLayer = bgLayer;
dsq->addElement(e);
core->addRenderObject(e, LR_ELEMENTS1+bgLayer);
}
}
else if (e)
{
core->removeRenderObject(e, Core::DO_NOT_DESTROY_RENDER_OBJECT);
core->addRenderObject(e, LR_ELEMENTS1+bgLayer);
dsq->removeElement(e);
e->bgLayer = bgLayer;
dsq->addElement(e);
core->addRenderObject(e, LR_ELEMENTS1+bgLayer);
}
}
@ -2998,8 +3002,8 @@ void SceneEditor::doPrevElement()
if (curElement < 0)
curElement = dsq->game->elementTemplates.size()-1;
if(curElement < 0)
return;
if (curElement < 0)
return;
if (dsq->game->elementTemplates[curElement].idx < 1024)
{