From 7ed41ad52cf3ce372f589b918fbb3688f8bc377c Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 8 Jun 2023 11:04:12 +0300
Subject: [PATCH] Rename some events for clarity and consistency

---
 source/game/events.h            |  4 ++--
 source/game/networking.cpp      | 12 ++++++------
 source/game/networking.h        |  4 ++--
 source/gameview/events.h        |  4 ++--
 source/gameview/playerinput.cpp |  4 ++--
 source/gameview/playerinput.h   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/source/game/events.h b/source/game/events.h
index ea903ec..c9948e0 100644
--- 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 30b5287..49b7d39 100644
--- 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 478b347..eacba93 100644
--- 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 fcb6395..48d1b62 100644
--- 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 5029ce5..ebdff1f 100644
--- 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 2797aff..c12d1b9 100644
--- 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
 	{
-- 
2.45.2