From da0913771538fd9b1ca538615fd9aa0388608466 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Sat, 9 May 2020 09:42:18 -0400 Subject: Merge audio; handle mouse events --- src/player.cpp | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'src/player.cpp') diff --git a/src/player.cpp b/src/player.cpp index b914672..f40a1d1 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -54,26 +54,23 @@ void PlayerSystem::receive(const KeyDownEvent& kue) { if (player.valid()) { if (kue.sym == SDLK_a) { - entities.each([&]([[maybe_unused]] entityx::Entity e, - EventListener& el) - { + entities.each( + [](entityx::Entity e, EventListener& el) { el.tryListener("MoveLeftPressed", e.component()->caller); - }); + }); } else if (kue.sym == SDLK_d) { - entities.each([&]([[maybe_unused]] entityx::Entity e, - EventListener& el) - { + entities.each( + [](entityx::Entity e, EventListener& el) { el.tryListener("MoveRightPressed", e.component()->caller); - }); + }); } else if (kue.sym == SDLK_SPACE) { - entities.each([&]([[maybe_unused]] entityx::Entity e, - EventListener& el) - { + entities.each( + [](entityx::Entity e, EventListener& el) { el.tryListener("JumpKeyPressed", e.component()->caller); - }); + }); } } } @@ -82,26 +79,23 @@ void PlayerSystem::receive(const KeyUpEvent& kue) { if (player.valid()) { if (kue.sym == SDLK_a) { - entities.each([&]([[maybe_unused]] entityx::Entity e, - EventListener& el) - { + entities.each( + [](entityx::Entity e, EventListener& el) { el.tryListener("MoveLeftReleased", e.component()->caller); - }); + }); } else if (kue.sym == SDLK_d) { - entities.each([&]([[maybe_unused]] entityx::Entity e, - EventListener& el) - { + entities.each( + [](entityx::Entity e, EventListener& el) { el.tryListener("MoveRightReleased", e.component()->caller); - }); + }); } else if (kue.sym == SDLK_SPACE) { - entities.each([&]([[maybe_unused]] entityx::Entity e, - EventListener& el) - { + entities.each( + [](entityx::Entity e, EventListener& el) { el.tryListener("JumpKeyReleased", e.component()->caller); - }); + }); } } } -- cgit v1.2.3