update with master; using VBOs for fonts

1 files changed, 8 insertions, 2 deletions

diff --git a/src/script.hpp b/src/script.hpp
index f86c8cd..0ac9e63 100644
--- a/src/script.hpp
+++ b/src/script.hpp
@@ -24,6 +24,8 @@
 #include <entityx/entityx.h>
 #include <sol/sol.hpp>
 
+#include "world.hpp"
+
 struct EntitySpawnEvent
 {
     sol::object ref;
@@ -48,10 +50,14 @@ private:
     sol::table game;
 
     entityx::EntityManager& manager;
+    
+    // TODO possibly emit events to spawn worlds instead of passing the
+    //  world system around like a toy
+    WorldSystem &worldSystem;
 
 public:
-    ScriptSystem(entityx::EntityManager& _manager):
-        manager(_manager) {}
+    ScriptSystem(entityx::EntityManager& _mg, WorldSystem& _ws):
+        manager(_mg), worldSystem(_ws) {}
 
     ~ScriptSystem(void) {}