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

3 files changed, 6 insertions, 2 deletions

diff --git a/include/entities.h b/include/entities.h
index 141d29a..1abe886 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
 };
 
 enum BUILD_SUB{
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 4e02a08..0a23965 100644
--- a/include/world.h
+++ b/include/world.h
@@ -234,6 +234,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.
@@ -280,7 +283,6 @@ public:
 class Arena : public World {
 private:
 	vec2	 pxy;
-	vec2	 door;
 	World	*exit;
 public:
 	Arena(World *leave,Player *p);