From ad5a63db312d0029109e6ca0051feaa516419ad2 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Tue, 1 Oct 2019 08:37:05 -0400
Subject: cleaned up lua function bindings
---
src/script.cpp | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'src/script.cpp')
diff --git a/src/script.cpp b/src/script.cpp
index 6cda627..0f940d3 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -87,12 +87,6 @@ void ScriptSystem::doFile(void)
void ScriptSystem::scriptExport(void)
{
- std::function<sol::table(sol::table)> entitySpawn =
- [this](sol::table t){ return spawn(t);};
-
- std::function<World* (sol::object)> worldRegister =
- [this](sol::object t){ return worldSystem.addWorld(t); };
-
lua.new_usertype<Position>("Position",
sol::constructors<Position(double x, double y), Position()>(),
"x", &Position::x,
@@ -137,8 +131,9 @@ void ScriptSystem::scriptExport(void)
"getSize", &World::getSize);
game = lua["game"].get_or_create<sol::table>();
- game.set_function("spawn", entitySpawn);
- game.set_function("worldRegister", worldRegister);
+ game.set_function("spawn", bindInstance(&ScriptSystem::spawn, this));
+ game.set_function("worldRegister", bindInstance(&WorldSystem::addWorld,
+ &worldSystem));
}
sol::table ScriptSystem::spawn(sol::object param)
--
cgit v1.2.3