From b28023525c6dcf2360c8d03b405d46af4e0e1c6d Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 10 Dec 2015 08:13:15 -0500
Subject: Doing shit

---
 include/common.h   |  8 +++++++-
 include/entities.h | 19 +++++++++++++++++++
 include/world.h    |  2 ++
 3 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index f8bd935..8050852 100644
--- a/include/common.h
+++ b/include/common.h
@@ -54,11 +54,17 @@ typedef struct {
 	vec2 end;
 } Ray;
 
+typedef struct{
+	float red;
+	float green;
+	float blue;
+} Color;
+
 /**
  * Define the game's name (displayed in the window title).
  */
 
-#define GAME_NAME		"Independent Study v.0.4 alpha"
+#define GAME_NAME		"Independent Study v.0.5 alpha - NOW WITH SOUND!"
 
 /**
  * The desired width of the game window.
diff --git a/include/entities.h b/include/entities.h
index 64a251a..e0c0887 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -34,6 +34,25 @@ enum MOB_SUB {
 	MS_TRIGGER
 };
 
+struct Particles{
+	vec2 loc;
+	float width;
+	float height;
+	Color color;
+	Particles(float x, float y, float w, float h, Color c){
+		loc.x = (x);
+		loc.y = (y);
+		width = (w);
+		height = (h);
+		color.red = (c.red);
+		color.green = (c.green);
+		color.blue = (c.blue);
+	}
+	void draw(){
+		std::cout << "Drawing Particles\n";
+	}
+};
+
 class Entity{
 public:
 	Inventory *inv;
diff --git a/include/world.h b/include/world.h
index ccf93a8..5a16277 100644
--- a/include/world.h
+++ b/include/world.h
@@ -159,12 +159,14 @@ public:
 	std::vector<Mob			*>	mob;
 	std::vector<Entity		*>	entity;
 	std::vector<Object		*>	object;
+	std::vector<Particles	*>	particles;
 	
 	void addStructure(_TYPE t,float x,float y,World *outside,World *inside);
 	void addMob(int t,float x,float y);
 	void addMob(int t,float x,float y,void (*hey)(Mob *));
 	void addNPC(float x,float y);
 	void addObject(ITEM_ID, bool, const char *, float, float);
+	void addParticle(float x, float y, float w, float h, Color color);
 	
 	void update(Player *p,unsigned int delta);
 	
-- 
cgit v1.2.3