particle textures fixed

2 files changed, 4 insertions, 2 deletions

diff --git a/include/particle.hpp b/include/particle.hpp
index a022583..63f23e3 100644
--- a/include/particle.hpp
+++ b/include/particle.hpp
@@ -19,8 +19,10 @@ struct Particle {
 	ParticleType type;
 	int timeLeft;
 
+	//const Texture& color; // TODO
+
 	Particle(vec2 p, ParticleType t = ParticleType::Drop, int tl = 3000)
-		: location(p), type(t), timeLeft(tl) {} // TODO times
+		: location(p), type(t), timeLeft(tl) {}
 } __attribute__ ((packed));
 
 class ParticleSystem : public entityx::System<ParticleSystem> {
diff --git a/include/texture.hpp b/include/texture.hpp
index 878955e..3cb8d1f 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -19,7 +19,7 @@
  * Handles a single texture, loaded from the given file.
  */
 class Texture {
-private:
+protected:
 	std::string name; /**< The name (path) of the loaded file. */
 	GLuint tex;       /**< The GLuint for the loaded texture. */
 	vec2 dim;         /**< The dimensions of the loaded texture. */