chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e334bc)
Rename SetPlayer to AddPlayer
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Jun 2022 22:49:48 +0000 (23:49 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Jun 2022 23:08:16 +0000 (00:08 +0100)
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 <ijackson@chiark.greenend.org.uk>
src/global.rs patch | blob | history
src/updates.rs patch | blob | history
templates/script.ts patch | blob | history

diff --git a/src/global.rs b/src/global.rs
index 7ed39cc8665cd0abd5ea96fb654bba6d9f9a2989..3a8b6f195a5d2fac7bcd7334a7129ae16559d5f4 100644 (file)
--- 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 dca1b10ff2b730de7cb152be09e1a3528067e80e..3467f66a80c39a6c2fd6c9f50cab06bbfb53b415 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -68,7 +68,7 @@ pub enum PreparedUpdateEntry {
   SetTableSize(Pos),
   SetTableColour(Colour),
   SetLinks(Arc<LinksTable>),
-  AddPlayer {
+  SetPlayer {
     player: PlayerId,
     data: DataLoadPlayer,
     new_info_pane: Arc<Html>,
@@ -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 e1a856390ab536d49c5fe8b1c3b1f833f1239c94..ed364ccc2348dbea433d58b1c7f6ec5a1a443c85 100644 (file)
--- 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 = <MessageHandler>function
+messages.SetPlayer = <MessageHandler>function
 (j: { player: string, data: PlayerInfo } & PlayersUpdate) {
   players[j.player] = j.data;
   player_info_pane_set(j);
Unnamed repository; edit this file 'description' to name the repository.