diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 7 | ||||
| -rw-r--r-- | include/world.h | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/entities.h b/include/entities.h index fe316ad..403c3c5 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 3d5fdad..a32c7f2 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); void addObject(int, bool, char*, float, float); @@ -193,10 +194,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; |