mem leak patches; world ground from image

2 files changed, 27 insertions, 0 deletions

diff --git a/include/systems/light.hpp b/include/systems/light.hpp
index ba91113..02c7eed 100644
--- a/include/systems/light.hpp
+++ b/include/systems/light.hpp
@@ -21,6 +21,11 @@ class LightSystem : public entityx::System<LightSystem> {
 private:
 	static std::vector<Light> lights;
 
+	static GLfloat *colorData;
+	static GLfloat *coordData;
+
+	static void resizeLights(void);
+
 public:
 	void update(entityx::EntityManager& en, entityx::EventManager& ev, entityx::TimeDelta dt) override;
 
diff --git a/include/systems/movement.hpp b/include/systems/movement.hpp
index fd37665..745fa9b 100644
--- a/include/systems/movement.hpp
+++ b/include/systems/movement.hpp
@@ -2,10 +2,32 @@
 #define SYSTEM_MOVEMENT_HPP_
 
 #include <entityx/entityx.h>
+#include <attack.hpp>
 
 class MovementSystem : public entityx::System<MovementSystem> {
+private:
+	constexpr static const char *hitPlayerScript = "\
+		effect = function()\n \
+			flash(255, 0, 0)\n \
+			damage(1)\n \
+		end\n \
+		hit = function()\n \
+			xrange = 5\n \
+		end";
+	static LuaScript hitPlayer;
+	static Attack playerAttack;
+
 public:
+	MovementSystem(void) {
+		hitPlayer = LuaScript(hitPlayerScript);
+		AttackSystem::initLua(hitPlayer);
+		playerAttack = { vec2(), vec2(5, 5), vec2(), vec2(),
+			hitPlayer, TextureIterator() };
+	}
+
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
+
+	static int doAttack(lua_State *);
 };
 
 #endif // SYSTEM_MOVEMENT_HPP_