From 589e5a90d40262197c33cb4bd86d01d35b456a36 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Sat, 14 May 2016 17:50:39 +0200 Subject: [PATCH] derp --- Aquaria/Game.cpp | 2 -- Aquaria/ScriptInterface.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp index c96cb9f..5abae96 100644 --- a/Aquaria/Game.cpp +++ b/Aquaria/Game.cpp @@ -6781,8 +6781,6 @@ void Game::applyState() cameraInterp = avatar->position; core->cameraPos = getCameraPositionFor(avatar->position); - core->sort(); - if (dsq->mod.isActive()) dsq->runScript(dsq->mod.getPath() + "scripts/premap_" + sceneName + ".lua", "init", true); else diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp index e900696..868163c 100644 --- a/Aquaria/ScriptInterface.cpp +++ b/Aquaria/ScriptInterface.cpp @@ -1237,7 +1237,7 @@ luaFunc(obj_addChild) luaFunc(obj_getChild) { 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); } @@ -1266,7 +1266,7 @@ luaFunc(obj_removeAllChildren) if(r) { if(del) - for(children.begin(); it != r->children.end(); ++it) + for(RenderObject::Children::iterator it = r->children.begin(); it != r->children.end(); ++it) (*it)->safeKill(); r->children.clear(); }