From 477e6cdde57a428b41e814943233d8b01f0db6bf Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Mon, 14 Dec 2015 08:41:31 -0500 Subject: arenas --- include/entities.h | 3 ++- include/ui.h | 1 + include/world.h | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/entities.h b/include/entities.h index dd3adab..30947f5 100644 --- a/include/entities.h +++ b/include/entities.h @@ -31,7 +31,8 @@ enum GENDER{ enum MOB_SUB { MS_RABBIT = 1, MS_BIRD, - MS_TRIGGER + MS_TRIGGER, + MS_DOOR }; class Entity{ diff --git a/include/ui.h b/include/ui.h index 2fe3b0a..5d17c47 100644 --- a/include/ui.h +++ b/include/ui.h @@ -87,6 +87,7 @@ namespace ui { void toggleBlack(void); void toggleBlackFast(void); void toggleWhite(void); + void toggleWhiteFast(void); void waitForCover(void); } diff --git a/include/world.h b/include/world.h index 1e78cd0..777f5b8 100644 --- a/include/world.h +++ b/include/world.h @@ -231,6 +231,9 @@ public: World *goWorldRight(Player *p); World *goWorldBack(Player *p); World *goWorldFront(Player *p); + + bool isWorldLeft(void); + bool isWorldRight(void); /* * Called to enter/exit a structure. @@ -277,7 +280,6 @@ public: class Arena : public World { private: vec2 pxy; - vec2 door; World *exit; public: Arena(World *leave,Player *p); -- cgit v1.2.3