event feature work; ozone bgm redone

9 files changed, 33 insertions, 21 deletions

diff --git a/src/attack.cpp b/src/attack.cpp
index e4b2671..720e2f2 100644
--- a/src/attack.cpp
+++ b/src/attack.cpp
@@ -28,9 +28,10 @@ bool inrange(float point, float left, float right)
 
 std::vector<AttackSystem::AttackAnimation> AttackSystem::effects;
 
-void AttackSystem::receive(const AttackEvent& ae)
+bool AttackSystem::receive(const AttackEvent& ae)
 {
 	attacks.emplace_front(ae);
+	return true;
 }
 
 void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, entityx::TimeDelta dt)
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 95ab523..f200705 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -212,7 +212,7 @@ void InventorySystem::render(void)
 	Render::textShader.unuse();
 }
 
-void InventorySystem::receive(const MouseClickEvent &mce)
+bool InventorySystem::receive(const MouseClickEvent &mce)
 {
 	if (mce.button == SDL_BUTTON_RIGHT) {
 		game::entities.each<ItemDrop>([&](entityx::Entity e, ItemDrop& id) {
@@ -248,9 +248,10 @@ void InventorySystem::receive(const MouseClickEvent &mce)
 				game::events.emit<UseItemEvent>(mce.position, items[0].item, &attack->second);
 		}
 	}
+	return true;
 }
 
-void InventorySystem::receive(const MouseReleaseEvent &mre)
+bool InventorySystem::receive(const MouseReleaseEvent &mre)
 {
 	if (movingItem != -1) {
 		int end = fullInventory ? items.size() : hotbarSize;
@@ -265,7 +266,7 @@ void InventorySystem::receive(const MouseReleaseEvent &mre)
 				}
 
 				movingItem = -1;
-				return;
+				return true;
 			}
 		}
 
@@ -274,6 +275,7 @@ void InventorySystem::receive(const MouseReleaseEvent &mre)
 		items[movingItem].count = 0;
 		movingItem = -1;
 	}
+	return true;
 }
 
 void InventorySystem::makeDrop(const vec2& p, InventoryEntry& ie)
@@ -308,11 +310,11 @@ void InventorySystem::makeDrop(const vec2& p, const std::string& s, int c)
 	e.assign<Physics>();
 }
 
-void InventorySystem::receive(const KeyDownEvent &kde)
+bool InventorySystem::receive(const KeyDownEvent &kde)
 {
-    if (kde.keycode == SDLK_e) {
+    if (kde.keycode == SDLK_e)
 		fullInventory ^= true;
-	}
+	return true;
 }
 
 void InventorySystem::add(const std::string& name, int count)
diff --git a/src/player.cpp b/src/player.cpp
index 3606bc7..9611d0e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -132,7 +132,7 @@ void PlayerSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 		vel.x /= 2.0f;
 }
 
-void PlayerSystem::receive(const KeyUpEvent &kue)
+bool PlayerSystem::receive(const KeyUpEvent &kue)
 {
 	auto kc = kue.keycode;
 
@@ -145,9 +145,10 @@ void PlayerSystem::receive(const KeyUpEvent &kue)
 	} else if (kc == getControl(5)) {
 		// TODO ...?
 	}
+	return true;
 }
 
-void PlayerSystem::receive(const KeyDownEvent &kde)
+bool PlayerSystem::receive(const KeyDownEvent &kde)
 {
 	auto kc = kde.keycode;
 	auto& loc = *player.component<Position>().get();
@@ -192,6 +193,7 @@ void PlayerSystem::receive(const KeyDownEvent &kde)
 	} else if (kc == SDLK_t) {
 		game::time::tick(50);
 	}
+	return true;
 }
 
 vec2 PlayerSystem::getPosition(void) 
@@ -211,7 +213,7 @@ float PlayerSystem::getWidth(void)
 	return width;
 }
 
-void PlayerSystem::receive(const UseItemEvent& uie)
+bool PlayerSystem::receive(const UseItemEvent& uie)
 {
 	static std::atomic_bool cool (true);
 
@@ -254,4 +256,5 @@ void PlayerSystem::receive(const UseItemEvent& uie)
 			cool.store(true);
 		}, uie.item->cooldown).detach();
 	}
+	return true;
 }
diff --git a/src/systems/dialog.cpp b/src/systems/dialog.cpp
index 87327ca..dd07ab8 100644
--- a/src/systems/dialog.cpp
+++ b/src/systems/dialog.cpp
@@ -25,7 +25,7 @@ void DialogSystem::configure(entityx::EventManager &ev)
 	ev.subscribe<MouseClickEvent>(*this);
 }
 
-void DialogSystem::receive(const MouseClickEvent &mce)
+bool DialogSystem::receive(const MouseClickEvent &mce)
 {
 	game::entities.each<Position, Solid, Dialog, Name>(
 		[&](entityx::Entity e, Position &pos, Solid &dim, Dialog &d, Name &name) {
@@ -144,6 +144,7 @@ void DialogSystem::receive(const MouseClickEvent &mce)
 			}
 		}
 	});
+	return true;
 }
 
 void DialogSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
diff --git a/src/tinyxml2.cpp b/src/tinyxml2.cpp
index d765357..7473881 100755
--- a/src/tinyxml2.cpp
+++ b/src/tinyxml2.cpp
@@ -409,17 +409,17 @@ void XMLUtil::ConvertUTF32ToUTF8(unsigned long input, char* output, int* length)
             --output;

             *output = (char)((input | BYTE_MARK) & BYTE_MASK);

             input >>= 6;

-	    [[fallthrough]];

+	    //[[fallthrough]];

         case 3:

             --output;

             *output = (char)((input | BYTE_MARK) & BYTE_MASK);

             input >>= 6;

-	    [[fallthrough]];

+	    //[[fallthrough]];

         case 2:

             --output;

             *output = (char)((input | BYTE_MARK) & BYTE_MASK);

             input >>= 6;

-	    [[fallthrough]];

+	    //[[fallthrough]];

         case 1:

             --output;

             *output = (char)(input | FIRST_BYTE_MARK[*length]);

diff --git a/src/ui.cpp b/src/ui.cpp
index 35de60c..7a10b20 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -631,7 +631,7 @@ namespace ui {
 
 using namespace ui;
 
-void InputSystem::receive(const MainSDLEvent& event)
+bool InputSystem::receive(const MainSDLEvent& event)
 {
 	const auto& e = event.event;
 	auto& ev = game::events;
@@ -730,6 +730,7 @@ void InputSystem::receive(const MainSDLEvent& event)
 		break;
 		
 	}
+	return true;
 }
 
 void InputSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
diff --git a/src/ui_menu.cpp b/src/ui_menu.cpp
index 11c10a7..a48182b 100644
--- a/src/ui_menu.cpp
+++ b/src/ui_menu.cpp
@@ -11,12 +11,12 @@
 
 static Menu* currentMenu = nullptr;
 
-void SDLReceiver::receive(const MainSDLEvent& mse)
+bool SDLReceiver::receive(const MainSDLEvent& mse)
 {
 	switch (mse.event.type) {
 	case SDL_QUIT:
 		game::endGame();
-		return;
+		return true;
 		break;
 	case SDL_MOUSEMOTION:
 		//ui::premouse.x = e.motion.x;
@@ -36,6 +36,7 @@ void SDLReceiver::receive(const MainSDLEvent& mse)
 	default:
 		break;
 	}
+	return true;
 }
 
 bool SDLReceiver::clicked = false;
diff --git a/src/window.cpp b/src/window.cpp
index af0f63b..48c0f31 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -75,13 +75,14 @@ void WindowSystem::configure(entityx::EventManager &ev)
 }
 
 
-void WindowSystem::receive(const WindowResizeEvent &wre)
+bool WindowSystem::receive(const WindowResizeEvent &wre)
 {
 	game::SCREEN_WIDTH = wre.x;
 	game::SCREEN_HEIGHT = wre.y;
 
 	glViewport(0, 0, wre.x, wre.y);
 	SDL_SetWindowSize(window, wre.x, wre.y);
+	return true;
 }
 
 #include <ui.hpp>
@@ -90,10 +91,11 @@ void WindowSystem::receive(const WindowResizeEvent &wre)
 
 static std::atomic_bool doScreenshot;
 
-void WindowSystem::receive(const ScreenshotEvent &scr)
+bool WindowSystem::receive(const ScreenshotEvent &scr)
 {
 	(void)scr;
 	doScreenshot.store(true);
+	return true;
 }
 
 void WindowSystem::render(void)
diff --git a/src/world.cpp b/src/world.cpp
index af6f47b..7904c4f 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -758,11 +758,11 @@ void WorldSystem::render(void)
 	waitToSwap = false;
 }
 
-void WorldSystem::receive(const BGMToggleEvent &bte)
+bool WorldSystem::receive(const BGMToggleEvent &bte)
 {
 	if (bte.world == nullptr || world.bgm != bte.file) {
 		if (bgmCurrent == world.bgm)
-			return;
+			return true;
 
 		Mix_FadeOutMusic(800);
 
@@ -773,6 +773,7 @@ void WorldSystem::receive(const BGMToggleEvent &bte)
 		bgmObj = Mix_LoadMUS(world.bgm.c_str());
 		Mix_PlayMusic(bgmObj, -1);
 	}
+	return true;
 }
 
 void WorldSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)