Merge pull request #89 from theo-walton/crashfix

crashfix

src/GameState.cpp

@@ -106,9 +106,7 @@ void GameState::Update(double dt)
 		_lorePannel.Render();
 		return;
 	}
-
-	_cells(_registry);
-
+
 	systems::RenderModels(_registry, _modelCache, _window, _camera, dt);
 	systems::TimedEffect(_registry, dt);
 	systems::Buttons(_registry, _window);
@@ -123,4 +121,5 @@ void GameState::Update(double dt)
 	systems::Images(_registry, _imageCache, _window);
 	systems::Texts(_registry, _window);
 	systems::Sound(_registry, dt);
+	_cells(_registry);
 }

src/LevelSelectState.cpp

@@ -58,7 +58,7 @@ static void	create_locked_icon(entt::DefaultRegistry& r, size_t i)
 
 	auto locked = r.create();
 	r.assign<c::Image>(locked,
-			   "assets/textures/locked.png",
+			   "assets/textures/dark_blue_button.png",
 			   botlefts[i],
 			   toprights[i],
 			   1);

src/Texture.cpp

@@ -6,7 +6,10 @@ Texture::Texture(std::string filepath)
 	unsigned error = lodepng::decode(_imageData, _width, _height, filepath.c_str());
 
 	if (error)
+	{
+		std::cout << filepath << std::endl;
 		std::cout << "error: " << lodepng_error_text(error) << std::endl;
+	}
 
 	std::vector<unsigned char> temp(_width * 4);
 

src/bomberman.hpp

@@ -2,6 +2,7 @@
 
 #define GLFW_INCLUDE_GLCOREARB
 #define GLM_ENABLE_EXPERIMENTAL
+#define NDEBUG
 
 #include <GLFW/glfw3.h>
 #include <string>

src/scripts.cpp

@@ -9,7 +9,7 @@ script	explode(int power)
 	return [power](entt::DefaultRegistry& r, uint32_t e)
 	{
 		auto ex = r.create();
-		glm::vec3 &pos = r.get<c::Position>(e).pos;
+		glm::vec3& pos = r.get<c::Position>(e).pos;
 		auto &sound = r.get<c::EngineTag>().ref.sound;
 
 		r.assign<c::Explosion>(ex, power);
@@ -72,17 +72,16 @@ script	death(std::string level)
 {
 	return [level](entt::DefaultRegistry& r, uint32_t e)
 	{
-		explode(1)(r, e);
+		auto ex = r.create();
 		auto &sound = r.get<c::EngineTag>().ref.sound;
 		auto game_over = [level](entt::DefaultRegistry& r, uint32_t)
 		{
 			auto& engine = r.get<c::EngineTag>().ref;
 			engine.ChangeState(new DeathState(engine, level));
 		};
 		sound.play2D(ASSET_PATH "sounds/player_death.wav");
-		r.assign<c::TimedEffect>(e, 1.5f, game_over);
-		r.remove<c::Model>(e);
-		r.remove<c::Vulnerable>(e);
+		r.assign<c::TimedEffect>(ex, 1.5f, game_over);
+		r.destroy(e);
 	};
 }