From 534a86c74d4976824e65fd302745ad81990849bd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 12 Jun 2022 23:49:48 +0100 Subject: [PATCH] Rename SetPlayer to AddPlayer The JS code can handle this as an update to a new player or as an update to an existing one. We're going to send this update when a player nick changes. Signed-off-by: Ian Jackson --- src/global.rs | 2 +- src/updates.rs | 8 ++++---- templates/script.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/global.rs b/src/global.rs index 7ed39cc8..3a8b6f19 100644 --- a/src/global.rs +++ b/src/global.rs @@ -715,7 +715,7 @@ impl<'ig> InstanceGuard<'ig> { let update = (||{ let new_info_pane = Arc::new(self.player_info_pane()?); - let update = PreparedUpdateEntry::AddPlayer { + let update = PreparedUpdateEntry::SetPlayer { player, new_info_pane, data: DataLoadPlayer::from_player(self, player), }; diff --git a/src/updates.rs b/src/updates.rs index dca1b10f..3467f66a 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -68,7 +68,7 @@ pub enum PreparedUpdateEntry { SetTableSize(Pos), SetTableColour(Colour), SetLinks(Arc), - AddPlayer { + SetPlayer { player: PlayerId, data: DataLoadPlayer, new_info_pane: Arc, @@ -264,7 +264,7 @@ enum TransmitUpdateEntry<'u> { }, SetTableSize(Pos), SetTableColour(&'u Colour), - AddPlayer { + SetPlayer { player: PlayerId, data: &'u DataLoadPlayer, new_info_pane: &'u Html, @@ -959,8 +959,8 @@ impl PreparedUpdate { PUE::SetTableColour(colour) => { TUE::SetTableColour(colour) } - &PUE::AddPlayer { player, ref new_info_pane, ref data } => { - TUE::AddPlayer { player, new_info_pane, data } + &PUE::SetPlayer { player, ref new_info_pane, ref data } => { + TUE::SetPlayer { player, new_info_pane, data } } &PUE::RemovePlayer { player, ref new_info_pane } => { TUE::RemovePlayer { player, new_info_pane } diff --git a/templates/script.ts b/templates/script.ts index e1a85639..ed364ccc 100644 --- a/templates/script.ts +++ b/templates/script.ts @@ -1508,7 +1508,7 @@ function rectsel_mouseup(e: MouseEvent) { type PlayersUpdate = { new_info_pane: string }; -messages.AddPlayer = function +messages.SetPlayer = function (j: { player: string, data: PlayerInfo } & PlayersUpdate) { players[j.player] = j.data; player_info_pane_set(j); -- 2.30.2