cutscenes, arenas

2 files changed, 11 insertions, 5 deletions

diff --git a/include/entities.h b/include/entities.h
index b590c8d..c2de1b1 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -30,7 +30,8 @@ enum GENDER{
 
 enum MOB_SUB {
 	MS_RABBIT = 1,
-	MS_BIRD
+	MS_BIRD,
+	MS_TRIGGER
 };
 
 class Entity{
@@ -102,8 +103,10 @@ public:
 
 class Mob : public Entity{
 public:
-	float init_y;
+	double init_y;
+	void (*hey)();
 	Mob(int);
+	Mob(int,unsigned int);
 	void wander(int);
 };
 
diff --git a/include/world.h b/include/world.h
index ac41dd6..8f4ea51 100644
--- a/include/world.h
+++ b/include/world.h
@@ -83,6 +83,7 @@ public:
 	
 	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)());
 	void addNPC(float x,float y);
 	void addObject(int, float, float);
 
@@ -191,10 +192,12 @@ public:
 
 class Arena : public World {
 private:
-	World *exit;
+	vec2	 pxy;
+	vec2	 door;
+	World	*exit;
 public:
-	void drawDoor(void);
-	World *exitArena(void);
+	Arena(World *leave,Player *p);
+	World *exitArena(Player *p);
 };
 
 extern int worldShade;