Rename some events for clarity and consistency

diff --git a/source/game/events.h b/source/game/events.h
index ea903ece54d74d7a0801feff3a699e382e924a9b..c9948e0cfc64ad0cabd3d5c8b351dd769dab73c3 100644 (file)
--- a/source/game/events.h
+++ b/source/game/events.h
@@ -15,13 +15,13 @@ namespace Events {
 // Defined in networking.h
 struct NetworkStateChanged;
 
-struct NetworkPlayerAdded
+struct NetworkPlayerArrived
 {
        unsigned id;
        std::string name;
 };
 
-struct NetworkPlayerRemoved
+struct NetworkPlayerDeparted
 {
        unsigned id;
 };

diff --git a/source/game/networking.cpp b/source/game/networking.cpp
index 30b5287fd616df7088e8462e78125a30b6df11d7..49b7d39f56c1c4c48dc37e40523331c8ea2f51e8 100644 (file)
--- a/source/game/networking.cpp
+++ b/source/game/networking.cpp
@@ -60,7 +60,7 @@ void Networking::reap_connections()
                        {
                                if(j->owner==i->get())
                                {
-                                       event_source.emit<Events::NetworkPlayerRemoved>(j->id);
+                                       event_source.emit<Events::NetworkPlayerDeparted>(j->id);
                                        j = players.erase(j);
                                }
                                else
@@ -91,7 +91,7 @@ void Networking::add_player(const string &name, function<void(unsigned)> callbac
                for(const auto &c: clients)
                        c->get_communicator().send(added);
 
-               event_source.emit<Events::NetworkPlayerAdded>(player.id, player.name);
+               event_source.emit<Events::NetworkPlayerArrived>(player.id, player.name);
        }
        else
        {
@@ -183,13 +183,13 @@ void Networking::ServerConnection::receive(const Messages::AddPlayerResponse &ad
                i->add_callback(i->id);
                i->add_callback = nullptr;
        }
-       networking.event_source.emit<Events::NetworkPlayerAdded>(i->id, i->name);
+       networking.event_source.emit<Events::NetworkPlayerArrived>(i->id, i->name);
 }
 
 void Networking::ServerConnection::receive(const Messages::PlayerAdded &added)
 {
        Player &player = networking.create_player(added.name, added.id);
-       networking.event_source.emit<Events::NetworkPlayerAdded>(player.id, player.name);
+       networking.event_source.emit<Events::NetworkPlayerArrived>(player.id, player.name);
 }
 
 void Networking::ServerConnection::receive(const Messages::PlayerRemoved &removed)
@@ -197,7 +197,7 @@ void Networking::ServerConnection::receive(const Messages::PlayerRemoved &remove
        auto i = find_member(networking.players, static_cast<unsigned>(removed.id), &Player::id);
        if(i!=networking.players.end())
        {
-               networking.event_source.emit<Events::NetworkPlayerRemoved>(i->id);
+               networking.event_source.emit<Events::NetworkPlayerDeparted>(i->id);
                networking.players.erase(i);
        }
 }
@@ -226,7 +226,7 @@ void Networking::ClientConnection::receive(const Messages::AddPlayerRequest &add
                if(c.get()!=this)
                        c->get_communicator().send(added);
 
-       networking.event_source.emit<Events::NetworkPlayerAdded>(player.id, player.name);
+       networking.event_source.emit<Events::NetworkPlayerArrived>(player.id, player.name);
 }
 
 } // namespace Msp::Game

diff --git a/source/game/networking.h b/source/game/networking.h
index 478b347182030b430a52a9396f204dee48eb9b7d..eacba9302b87d1210a502daf998e5af54566bcdd 100644 (file)
--- a/source/game/networking.h
+++ b/source/game/networking.h
@@ -26,8 +26,8 @@ public:
                CONNECTED
        };
 
-       using EventSource = Game::EventSource<Events::NetworkStateChanged, Events::NetworkPlayerAdded,
-               Events::NetworkPlayerRemoved>;
+       using EventSource = Game::EventSource<Events::NetworkStateChanged, Events::NetworkPlayerArrived,
+               Events::NetworkPlayerDeparted, Events::ServerStageActivated>;
 
 private:
        class Connection

diff --git a/source/gameview/events.h b/source/gameview/events.h
index fcb6395e35161cc4792c2b0de16ec166d7a116b6..48d1b62e42f13d8820dae8ad6bd1ebc585e28e43 100644 (file)
--- a/source/gameview/events.h
+++ b/source/gameview/events.h
@@ -6,12 +6,12 @@
 namespace Msp::GameView {
 namespace Events {
 
-struct PlayerArrived
+struct LocalPlayerArrived
 {
        Input::ControlScheme &controls;
 };
 
-struct PlayerDeparted
+struct LocalPlayerDeparted
 {
        Input::ControlScheme &controls;
 };

diff --git a/source/gameview/playerinput.cpp b/source/gameview/playerinput.cpp
index 5029ce587da8029d27373a5695ed556e984b39b3..ebdff1fd57b0d630ba477a109bc207022c5f0e8d 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::PlayerArrived>(ref(*player.controls));
+       event_source.emit<Events::LocalPlayerArrived>(ref(*player.controls));
 }
 
 void PlayerInput::synthesize_initial_events(Game::EventObserver &observer)
 {
        for(const Player &p: players)
-               event_source.emit_to<Events::PlayerArrived>(observer, ref(*p.controls));
+               event_source.emit_to<Events::LocalPlayerArrived>(observer, ref(*p.controls));
 }
 
 } // namespace Msp::GameView

diff --git a/source/gameview/playerinput.h b/source/gameview/playerinput.h
index 2797aff40d572956eb112dacce6fdb5f5228e563..c12d1b9217d341e8641057a9fb163ea8f64f415f 100644 (file)
--- a/source/gameview/playerinput.h
+++ b/source/gameview/playerinput.h
@@ -16,7 +16,7 @@ namespace Msp::GameView {
 class MSPGAMEVIEW_API PlayerInput: public NonCopyable
 {
 public:
-       using EventSource = Game::EventSource<Events::PlayerArrived, Events::PlayerDeparted>;
+       using EventSource = Game::EventSource<Events::LocalPlayerArrived, Events::LocalPlayerDeparted>;
 
        enum Mode
        {