event feature work; ozone bgm redone

10 files changed, 17 insertions, 16 deletions

diff --git a/include/attack.hpp b/include/attack.hpp
index 37025e1..941e3d7 100644
--- a/include/attack.hpp
+++ b/include/attack.hpp
@@ -47,7 +47,7 @@ public:
 		ev.subscribe<AttackEvent>(*this);
 	}
 
-	void receive(const AttackEvent& ae);
+	bool receive(const AttackEvent& ae);
 	void update(entityx::EntityManager& en, entityx::EventManager& ev, entityx::TimeDelta dt) override;
 	static void render(void);
 };
diff --git a/include/common.hpp b/include/common.hpp
index a03a888..9ecd912 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -23,11 +23,11 @@ constexpr float PI = 3.1415926535f;
  */
 unsigned int millis(void);
 
-/*namespace std {
+namespace std {
 	template<class T>
 	constexpr const T& clamp(const T& v, const T& lo, const T& hi) {
 		return (v > hi) ? hi : ((v > lo) ? v : lo);
 	}
-}*/
+}
 
 #endif // COMMON_HPP_
diff --git a/include/engine.hpp b/include/engine.hpp
index 5824950..448c397 100644
--- a/include/engine.hpp
+++ b/include/engine.hpp
@@ -60,8 +60,9 @@ public:
 	 * A handler for the game ending event.
 	 * @param gee game end event data
 	 */
-	inline void receive(const GameEndEvent &gee) {
+	inline bool receive(const GameEndEvent &gee) {
 		shouldRun = !(gee.really);
+		return false;
 	}
 };
 
diff --git a/include/inventory.hpp b/include/inventory.hpp
index 475575c..448e27f 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -96,9 +96,9 @@ public:
 
 	void configure(entityx::EventManager &ev);
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
-	void receive(const KeyDownEvent &kde);
-	void receive(const MouseClickEvent &mce);
-	void receive(const MouseReleaseEvent &mce);
+	bool receive(const KeyDownEvent &kde);
+	bool receive(const MouseClickEvent &mce);
+	bool receive(const MouseReleaseEvent &mce);
 
 	static void render(void);
 
diff --git a/include/player.hpp b/include/player.hpp
index 077e798..ffd2863 100644
--- a/include/player.hpp
+++ b/include/player.hpp
@@ -53,15 +53,15 @@ public:
 	 * Handles key up events for the player.
 	 * @param kue key up event data
 	 */
-    void receive(const KeyUpEvent&);
+    bool receive(const KeyUpEvent&);
 
 	/**
 	 * Handles key down events for the player.
 	 * @param kde key down event data
 	 */
-    void receive(const KeyDownEvent&);
+    bool receive(const KeyDownEvent&);
 
-	void receive(const UseItemEvent&);
+	bool receive(const UseItemEvent&);
 
 	/**
 	 * Gets the player's position.
diff --git a/include/systems/dialog.hpp b/include/systems/dialog.hpp
index 407f043..9fd3b90 100644
--- a/include/systems/dialog.hpp
+++ b/include/systems/dialog.hpp
@@ -8,7 +8,7 @@
 class DialogSystem : public entityx::System<DialogSystem>, public entityx::Receiver<DialogSystem> {
 public:
 	void configure(entityx::EventManager&);
-	void receive(const MouseClickEvent&);
+	bool receive(const MouseClickEvent&);
 	void update(entityx::EntityManager&, entityx::EventManager&, entityx::TimeDelta) override;
 };
 
diff --git a/include/ui.hpp b/include/ui.hpp
index fa711d2..bfa2fdd 100644
--- a/include/ui.hpp
+++ b/include/ui.hpp
@@ -28,7 +28,7 @@ public:
 		ev.subscribe<MainSDLEvent>(*this);
 	}
 
-	void receive(const MainSDLEvent& event);
+	bool receive(const MainSDLEvent& event);
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
 };
 
diff --git a/include/ui_menu.hpp b/include/ui_menu.hpp
index cf7ffd6..2cbbefb 100644
--- a/include/ui_menu.hpp
+++ b/include/ui_menu.hpp
@@ -60,7 +60,7 @@ public:
 
 	void configure(entityx::EventManager& ev)
 	{ ev.subscribe<MainSDLEvent>(*this); }
-	void receive(const MainSDLEvent& mse);
+	bool receive(const MainSDLEvent& mse);
 	void update(entityx::EntityManager& en, entityx::EventManager& ev, entityx::TimeDelta dt) override 
 	{ (void)en, (void)ev, (void)dt; }
 };
diff --git a/include/window.hpp b/include/window.hpp
index 36618e5..29ea76b 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -41,8 +41,8 @@ public:
 
 	static void render(void);
 
-	void receive(const WindowResizeEvent&);	
-	void receive(const ScreenshotEvent&);
+	bool receive(const WindowResizeEvent&);	
+	bool receive(const ScreenshotEvent&);
 };
 
 #endif // WINDOW_HPP_
diff --git a/include/world.hpp b/include/world.hpp
index 570cc9d..059efa3 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -148,7 +148,7 @@ public:
 
 	static float isAboveGround(const vec2& p); //const;
 
-	void receive(const BGMToggleEvent &bte);
+	bool receive(const BGMToggleEvent &bte);
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
 	static void render(void);