merge

1 files changed, 8 insertions, 1 deletions

diff --git a/include/world.h b/include/world.h
index cdcea3c..5021fbb 100644
--- a/include/world.h
+++ b/include/world.h
@@ -29,7 +29,7 @@
  * Defines how many game ticks it takes for a day to elapse.
  */
 
-#define DAY_CYCLE 3000
+#define DAY_CYCLE 12000
 
 /**
  * The background type enum.
@@ -54,6 +54,11 @@ typedef enum {
 	RAIN		/**< Rain (not implemented :) )*/
 } WEATHER;
 
+
+typedef struct{
+	vec2 loc;
+	Color color;
+}Light;
 /**
  * The line structure.
  * This structure is used to store the world's ground, stored in vertical
@@ -169,6 +174,7 @@ public:
 	std::vector<Entity		*>	entity;
 	std::vector<Object		*>	object;
 	std::vector<Particles	*>	particles;
+	std::vector<Light        >  light;
 	
 	void addStructure(_TYPE t,BUILD_SUB sub,float x,float y,World *inside);
 	void addVillage(int bCount, int npcMin, int npcMax,_TYPE t,World *inside);
@@ -177,6 +183,7 @@ public:
 	void addNPC(float x,float y);
 	void addObject(ITEM_ID, bool, const char *, float, float);
 	void addParticle(float, float, float, float, float, float, Color color, int);
+	void addLight(vec2, Color);
 
 	NPC *getAvailableNPC(void);