lua - references

2 files changed, 25 insertions, 2 deletions

diff --git a/src/systems/lua.cpp b/src/systems/lua.cpp
index b093aff..fa1e93e 100644
--- a/src/systems/lua.cpp
+++ b/src/systems/lua.cpp
@@ -1,2 +1,25 @@
 #include <systems/lua.hpp>
 
+void LuaScript::setGlobal(const LuaVariable& nv)
+{
+	lua_pushnumber(state, std::get<float&>(nv));
+	lua_setglobal(state, std::get<std::string>(nv).c_str());
+}
+
+void LuaScript::operator()(std::vector<LuaVariable> vars)
+{
+	for (auto& v : vars)
+		setGlobal(v);
+	(*this)();
+	for (auto& v : vars) {
+		lua_getglobal(state, std::get<std::string>(v).c_str());
+		std::get<float&>(v) = lua_tonumber(state, -1);
+	}
+}
+
+void LuaScript::operator()(void)
+{
+	lua_getglobal(state, "update");
+	lua_pcall(state, 0, LUA_MULTRET, 0);
+}
+
diff --git a/src/systems/movement.cpp b/src/systems/movement.cpp
index 4eb574d..1a7112a 100644
--- a/src/systems/movement.cpp
+++ b/src/systems/movement.cpp
@@ -75,8 +75,8 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 			// make the entity wander
 			// TODO initialX and range?
 			if (entity.has_component<Wander>()) {
-				auto vel = entity.component<Wander>()->script();
-				direction.x = vel.x;
+				entity.component<Wander>()->script({LuaVariable("vely", direction.y),
+					LuaVariable("velx", direction.x)});
 				/*auto& countdown = entity.component<Wander>()->countdown;
 
 				if (countdown > 0) {