Merge branch 'master' of http://github.com/tcsullivan/gamedev

diff --cc include/entities.h
index 141d29a25856086198778e658896b57aa810e237,30947f5a7479e8eddd32d80c3f7c7ce01fdcede1..1abe8862c000f405d61224077153ed88ddb1032d
--- 1/include/entities.h
--- 2/include/entities.h
+++ b/include/entities.h
@@@ -31,53 -31,10 +31,54 @@@ enum GENDER
  enum MOB_SUB {
        MS_RABBIT = 1,
        MS_BIRD,
-       MS_TRIGGER
+       MS_TRIGGER,
+       MS_DOOR
  };
  
 +enum BUILD_SUB{
 +      TOWN_HALL = 1,
 +      HOUSE,
 +      HOUSE2,
 +      HOUSE3,
 +      HOUSE4,
 +      FOUNTAIN
 +};
 +
 +class Particles{
 +public:
 +      vec2 loc;
 +      float width;
 +      float height;
 +      float velx;
 +      float vely;
 +      Color color;
 +      int duration;
 +      bool canMove;
 +      Particles(float x, float y, float w, float h, float vx, float vy, Color c, int d){
 +              loc.x = (x);
 +              loc.y = (y);
 +              width = (w);
 +              height = (h);
 +              velx = vx;
 +              vely = vy;
 +              color.red = (c.red);
 +              color.green = (c.green);
 +              color.blue = (c.blue);
 +              duration = d;
 +      }
 +      ~Particles(){}
 +      void draw(){
 +              glColor3f(color.red,color.green,color.blue);
 +              glRectf(loc.x,loc.y,loc.x+width,loc.y+height);
 +      }
 +      bool kill(float delta){
 +              duration -= delta;
 +              if(duration <= 0)
 +                      return true;
 +              else return false;
 +      }
 +};
 +
  class Entity{
  public:
        Inventory *inv;

diff --cc include/world.h
Simple merge

diff --cc main.cpp
Simple merge

diff --cc src/entities.cpp
Simple merge

diff --cc src/gameplay.cpp
Simple merge

diff --cc src/world.cpp
Simple merge