mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-19 19:34:57 +00:00
Code Issues Releases Wiki Activity

derp

Browse source
This commit is contained in:
fgenesis 2016-05-14 17:50:39 +02:00
parent 15c7776763
commit 589e5a90d4
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aquaria/Game.cpp
View file

@ -6781,8 +6781,6 @@ void Game::applyState()
cameraInterp = avatar->position; cameraInterp = avatar->position;
core->cameraPos = getCameraPositionFor(avatar->position); core->cameraPos = getCameraPositionFor(avatar->position);
core->sort();
if (dsq->mod.isActive()) if (dsq->mod.isActive())
dsq->runScript(dsq->mod.getPath() + "scripts/premap_" + sceneName + ".lua", "init", true); dsq->runScript(dsq->mod.getPath() + "scripts/premap_" + sceneName + ".lua", "init", true);
else else

4
Aquaria/ScriptInterface.cpp
View file

@ -1237,7 +1237,7 @@ luaFunc(obj_addChild)
luaFunc(obj_getChild) luaFunc(obj_getChild)
{ {
RenderObject *r = robj(L); RenderObject *r = robj(L);
size_t idx = lua_tointeger(L. 2); size_t idx = lua_tointeger(L, 2);
luaReturnPtr(r && idx < r->children.size() ? r->children[idx] : NULL); luaReturnPtr(r && idx < r->children.size() ? r->children[idx] : NULL);
} }
@ -1266,7 +1266,7 @@ luaFunc(obj_removeAllChildren)
if(r) if(r)
{ {
if(del) if(del)
for(<RenderObject::Children::iterator it = r->children.begin(); it != r->children.end(); ++it) for(RenderObject::Children::iterator it = r->children.begin(); it != r->children.end(); ++it)
(*it)->safeKill(); (*it)->safeKill();
r->children.clear(); r->children.clear();
} }