From a81a6ef968c1988c6ed2dcb389979dfa86c8d1e1 Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Thu, 20 Jul 2023 19:27:06 +0300 Subject: [PATCH] [Protocol] GS 1 rename Player's frags field to score to be more inline with the other protocols --- CHANGELOG.md | 3 ++- src/protocols/gamespy/protocols/one/protocol.rs | 2 +- src/protocols/gamespy/protocols/one/types.rs | 8 +++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4a658c..8d9d133 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ Who knows what the future holds... To be made... ### Breaking... -Nothing, yet... +Protocols: +- Gamespy 1: Renamed the players `frags` field to `score` to be more inline with the other protocols. # 0.3.0 - 18/07/2023 ### Changes: diff --git a/src/protocols/gamespy/protocols/one/protocol.rs b/src/protocols/gamespy/protocols/one/protocol.rs index e8fdc08..487eec1 100644 --- a/src/protocols/gamespy/protocols/one/protocol.rs +++ b/src/protocols/gamespy/protocols/one/protocol.rs @@ -147,7 +147,7 @@ fn extract_players(server_vars: &mut HashMap, players_maximum: u face: player_data.get("face").ok_or(GDError::PacketBad)?.clone(), skin: player_data.get("skin").ok_or(GDError::PacketBad)?.clone(), mesh: player_data.get("mesh").ok_or(GDError::PacketBad)?.clone(), - frags: player_data + score: player_data .get("frags") .ok_or(GDError::PacketBad)? .trim() diff --git a/src/protocols/gamespy/protocols/one/types.rs b/src/protocols/gamespy/protocols/one/types.rs index 3cee4b0..f21f83c 100644 --- a/src/protocols/gamespy/protocols/one/types.rs +++ b/src/protocols/gamespy/protocols/one/types.rs @@ -18,19 +18,17 @@ pub struct Player { pub face: String, pub skin: String, pub mesh: String, - pub frags: u32, + pub score: u32, pub deaths: Option, pub health: Option, pub secret: bool, } impl CommonPlayer for Player { - fn as_original(&self) -> crate::protocols::types::GenericPlayer { - GenericPlayer::Gamespy(VersionedPlayer::One(self)) - } + fn as_original(&self) -> GenericPlayer { GenericPlayer::Gamespy(VersionedPlayer::One(self)) } fn name(&self) -> &str { &self.name } - // TODO: Maybe frags is score? + fn score(&self) -> Option { Some(self.score) } } /// A query response.