Include the input device in the LocalPlayerArrived event

diff --git a/source/gameview/events.h b/source/gameview/events.h
index 48d1b62e42f13d8820dae8ad6bd1ebc585e28e43..e5b41c4785eda9aa9faf664b4f3e6d5af13e5032 100644 (file)
--- a/source/gameview/events.h
+++ b/source/gameview/events.h
@@ -9,6 +9,7 @@ namespace Events {
 struct LocalPlayerArrived
 {
        Input::ControlScheme &controls;
+       Input::Device &device;
 };
 
 struct LocalPlayerDeparted

diff --git a/source/gameview/playerinput.cpp b/source/gameview/playerinput.cpp
index 9cd3fdf66ec957251f9f0bbde8f39fe2e360241d..e93f473c9d01d6153179fa1acbbd44e33190711a 100644 (file)
--- a/source/gameview/playerinput.cpp
+++ b/source/gameview/playerinput.cpp
@@ -30,13 +30,13 @@ void PlayerInput::add_player(Input::Device &dev)
                        b->apply_to(*player.controls, dev);
                        break;
                }
-       event_source.emit<Events::LocalPlayerArrived>(*player.controls);
+       event_source.emit<Events::LocalPlayerArrived>(*player.controls, dev);
 }
 
 void PlayerInput::synthesize_initial_events(Game::EventObserver &observer)
 {
        for(const Player &p: players)
-               event_source.emit_to<Events::LocalPlayerArrived>(observer, *p.controls);
+               event_source.emit_to<Events::LocalPlayerArrived>(observer, *p.controls, *p.device);
 }
 
 } // namespace Msp::GameView