2 files changed, 30 insertions, 22 deletions

diff --git a/src/systems/light.cpp b/src/systems/light.cpp
index 51a6702..b7c62aa 100644
--- a/src/systems/light.cpp
+++ b/src/systems/light.cpp
@@ -6,6 +6,17 @@
 
 std::vector<Light> LightSystem::lights;
 
+GLfloat *LightSystem::colorData = nullptr;
+GLfloat *LightSystem::coordData = nullptr;
+
+void LightSystem::resizeLights(void)
+{
+	delete colorData;
+	delete coordData;
+	colorData = new GLfloat[lights.size() * 4];
+	coordData = new GLfloat[lights.size() * 4];
+}
+
 void LightSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, entityx::TimeDelta dt) {
 	(void)ev;
 	(void)dt;
@@ -20,23 +31,20 @@ void LightSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
 }
 
 void LightSystem::render(void) {
-	auto coords = new GLfloat[lights.size() * 4];
-	auto colors = new GLfloat[lights.size() * 4];
-
 	unsigned int offset = 0;
 	for (const auto& l : lights) {
-		coords[offset] = l.pos.x, coords[offset + 1] = l.pos.y,
-			coords[offset + 2] = -5, coords[offset + 3] = l.radius;
-		colors[offset] = l.color.red, colors[offset + 1] = l.color.green,
-			colors[offset + 2] = l.color.blue, colors[offset + 3] = 1.0f;
+		coordData[offset] = l.pos.x, coordData[offset + 1] = l.pos.y,
+			coordData[offset + 2] = -5, coordData[offset + 3] = l.radius;
+		colorData[offset] = l.color.red, colorData[offset + 1] = l.color.green,
+			colorData[offset + 2] = l.color.blue, colorData[offset + 3] = 1.0f;
 		offset += 4;
 	}
 
 	Render::worldShader.use();
 	Render::worldShader.enable();
 
-	glUniform4fv(Render::worldShader.uniform[WU_light], lights.size(), coords);
-	glUniform4fv(Render::worldShader.uniform[WU_light_color], lights.size(), colors);
+	glUniform4fv(Render::worldShader.uniform[WU_light], lights.size(), coordData);
+	glUniform4fv(Render::worldShader.uniform[WU_light_color], lights.size(), colorData);
 	glUniform1i(Render::worldShader.uniform[WU_light_size], lights.size());
 
 	Render::worldShader.disable();
@@ -45,6 +53,7 @@ void LightSystem::render(void) {
 
 int LightSystem::addLight(vec2 pos, float radius, Color color) {
 	lights.emplace_back(pos, radius, color);
+	resizeLights();
 	return lights.size() - 1;
 }
 
@@ -56,5 +65,6 @@ void LightSystem::updateLight(int index, vec2 pos, float radius) {
 
 void LightSystem::removeLight(int index) {
 	lights.erase(lights.begin() + index);
+	resizeLights();
 }
 
diff --git a/src/systems/movement.cpp b/src/systems/movement.cpp
index 642fa6a..b2c95c5 100644
--- a/src/systems/movement.cpp
+++ b/src/systems/movement.cpp
@@ -10,11 +10,21 @@
 
 #include <thread>
 
-#include <attack.hpp>
 #include <events.hpp>
 #include <player.hpp>
 #include <ui.hpp>
 
+LuaScript MovementSystem::hitPlayer;
+Attack MovementSystem::playerAttack;
+
+int MovementSystem::doAttack(lua_State* s)
+{
+	vec2 pos (lua_tonumber(s, 1), lua_tonumber(s, 2));
+	game::events.emit<AttackEvent>(AttackEvent(pos,
+		playerAttack, false));
+	return 0;
+}
+
 void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
 {
 	//bool fight = false;
@@ -72,18 +82,6 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 				}
 			}
 
-			static auto doAttack = [](lua_State* s) -> int {
-				vec2 pos (lua_tonumber(s, 1), lua_tonumber(s, 2));
-				LuaScript script ("effect = function()\nflash(255,0,0)\ndamage(1)\nend\n\
-					hit = function()\nxrange = 5\nend");
-				AttackSystem::initLua(script);
-				Attack attack = {vec2(), vec2(5, 5), vec2(), vec2(),
-					script, TextureIterator()};
-				game::events.emit<AttackEvent>(AttackEvent(pos,
-					attack, false));
-				return 0;
-			};
-
 			// make the entity wander
 			// TODO initialX and range?
 			if (entity.has_component<Wander>()) {