From 2cedd39a90fdb0387783b50446b16732517fb651 Mon Sep 17 00:00:00 2001 From: Andy Belle-Isle Date: Tue, 17 Sep 2019 19:09:33 -0400 Subject: World can now draw properly, and camera follows player --- src/script.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/script.cpp') diff --git a/src/script.cpp b/src/script.cpp index cf5b2dd..fd99228 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -188,10 +188,6 @@ sol::table ScriptSystem::spawn(sol::object param) e.assign(Velocity().FromLua(tab["Velocity"])).get(); } - if (tab["Player"] != nullptr) { - (*toRet)["Player"] = e.assign().get(); - } - if (tab["Physics"] != nullptr) { if (!e.has_component()) // Position must exist for phys. (*toRet)["Position"] = e.assign().get(); @@ -214,6 +210,10 @@ sol::table ScriptSystem::spawn(sol::object param) e.assign(listeners); } + if (tab["Player"] != nullptr) { + (*toRet)["Player"] = e.assign().get(); + } + } else { // TODO better logging std::cerr << "Parameter to spawn() must be a table!" << std::endl; -- cgit v1.2.3