From 2f0fcbfeacafed52396f5e0b714aff444fcda6cd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 27 Feb 2021 13:25:55 +0000 Subject: [PATCH] rename IPieces and GPieces Signed-off-by: Ian Jackson --- src/gamestate.rs | 4 ++-- src/global.rs | 30 +++++++++++++++--------------- src/hidden.rs | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/gamestate.rs b/src/gamestate.rs index c091edc2..9bf15cb0 100644 --- a/src/gamestate.rs +++ b/src/gamestate.rs @@ -53,7 +53,7 @@ pub struct ZLevel { pub struct GameState { pub table_colour: Colour, pub table_size: Pos, - pub pieces: Pieces, + pub pieces: GPieces, pub gen: Generation, pub log: VecDeque<(Generation, Arc)>, pub max_z: ZCoord, @@ -171,7 +171,7 @@ pub trait Piece: Outline + Send + Debug { #[derive(Debug)] pub struct ApiPieceOpArgs<'a> { pub gs: &'a mut GameState, - pub ipieces: &'a PiecesLoaded, + pub ipieces: &'a IPieces, pub player: PlayerId, pub piece: PieceId, pub p: &'a dyn Piece, diff --git a/src/global.rs b/src/global.rs index cad764ea..5159df2c 100644 --- a/src/global.rs +++ b/src/global.rs @@ -45,7 +45,7 @@ deref_to_field_mut!{LinksTable, EnumMap>, 0} pub struct Instance { pub name: Arc, pub gs: GameState, - pub ipieces: PiecesLoaded, + pub ipieces: IPieces, pub clients: DenseSlotMap, pub iplayers: SecondarySlotMap, pub tokens_players: TokenRegistry, @@ -69,15 +69,15 @@ pub struct IPlayerState { #[derive(Debug,Serialize,Deserialize)] #[serde(transparent)] -pub struct PiecesLoaded(ActualPiecesLoaded); -pub type ActualPiecesLoaded = SecondarySlotMap>; +pub struct IPieces(ActualIPieces); +pub type ActualIPieces = SecondarySlotMap>; #[derive(Copy,Clone,Debug)] pub struct ModifyingPieces(()); #[derive(Debug,Serialize,Deserialize,Default)] #[serde(transparent)] -pub struct Pieces(pub(in crate::global) ActualPieces); -type ActualPieces = DenseSlotMap; +pub struct GPieces(pub(in crate::global) ActualGPieces); +type ActualGPieces = DenseSlotMap; #[derive(Debug)] pub struct Client { @@ -296,7 +296,7 @@ impl Instance { let g = Instance { name: name.clone(), gs, acl, - ipieces: PiecesLoaded(default()), + ipieces: IPieces(default()), clients: default(), iplayers: default(), tokens_players: default(), @@ -1009,7 +1009,7 @@ impl InstanceGuard<'_> { fn load_game(accounts: &AccountsGuard, games: &mut GamesGuard, name: InstanceName) -> Option { - let InstanceSaveAccesses:: + let InstanceSaveAccesses:: { tokens_players, mut ipieces, mut aplayers, acl, links } = match Self::load_something(&name, "a-") { Ok(data) => data, @@ -1073,7 +1073,7 @@ impl InstanceGuard<'_> { let g = Instance { gs, iplayers, links, acl: acl.into(), - ipieces: PiecesLoaded(ipieces), + ipieces: IPieces(ipieces), name: name.clone(), clients: default(), tokens_clients: default(), @@ -1246,12 +1246,12 @@ pub fn process_all_players_for_account< // ========== instance pieces data access ========== -impl PiecesLoaded { +impl IPieces { pub fn get(&self, piece: PieceId) -> Option<&Box> { self.0.get(piece) } - pub fn as_mut(&mut self, _: ModifyingPieces) -> &mut ActualPiecesLoaded { + pub fn as_mut(&mut self, _: ModifyingPieces) -> &mut ActualIPieces { &mut self.0 } } @@ -1259,21 +1259,21 @@ impl PiecesLoaded { // ---------- gamestate pieces table ---------- // No DerefMut to make sure we send updates, save, etc. -deref_to_field!{Pieces, ActualPieces, 0} +deref_to_field!{GPieces, ActualGPieces, 0} -impl Pieces { +impl GPieces { pub fn get_mut(&mut self, piece: PieceId) -> Option<&mut PieceState> { self.0.get_mut(piece) } pub fn values_mut(&mut self) -> sm::ValuesMut { self.0.values_mut() } - pub fn as_mut(&mut self, _: ModifyingPieces) -> &mut ActualPieces { + pub fn as_mut(&mut self, _: ModifyingPieces) -> &mut ActualGPieces { &mut self.0 } } -impl ById for Pieces { +impl ById for GPieces { type Id = PieceId; type Entry = PieceState; type Error = OnlineError; @@ -1292,7 +1292,7 @@ impl ById for Pieces { type IntoIter = sm::Iter<'p, PieceId, PieceState>; fn into_iter(self) -> Self::IntoIter { (&self.0).into_iter() } }*/ -impl<'p> IntoIterator for &'p mut Pieces { +impl<'p> IntoIterator for &'p mut GPieces { type Item = (PieceId, &'p mut PieceState); type IntoIter = sm::IterMut<'p, PieceId, PieceState>; fn into_iter(self) -> Self::IntoIter { (&mut self.0).into_iter() } diff --git a/src/hidden.rs b/src/hidden.rs index 5c8d8e87..66712bdd 100644 --- a/src/hidden.rs +++ b/src/hidden.rs @@ -228,7 +228,7 @@ fn recalculate_occultation_general< RF: FnOnce(PieceUpdateOps_PerPlayer, LD) -> RD, // ret_callback >( gs: &mut GameState, - ipieces: &PiecesLoaded, + ipieces: &IPieces, piece: PieceId, // if no change, we return ret_vanilla(log_visible) log_visible: LD, @@ -385,7 +385,7 @@ fn recalculate_occultation_general< pub fn recalculate_occultation_piece( gs: &mut GameState, who_by: Html, - ipieces: &PiecesLoaded, + ipieces: &IPieces, piece: PieceId, (vanilla_wrc, vanilla_op, vanilla_log): PUFOS, ) @@ -414,7 +414,7 @@ pub fn recalculate_occultation_piece( #[throws(IE)] fn recalculate_occultation_ofmany( gs: &mut GameState, - ipieces: &PiecesLoaded, + ipieces: &IPieces, ppiece: PieceId, updates: &mut Vec<(PieceId, PieceUpdateOps)>, ){ @@ -466,7 +466,7 @@ impl OccultationViewDef for OwnerOccultationView { #[throws(OnlineError)] pub fn create_occultation( gs: &mut GameState, - ipieces: &PiecesLoaded, + ipieces: &IPieces, region: Area, occulter: PieceId, views: OccultationViews, @@ -530,7 +530,7 @@ pub fn create_occultation( #[throws(IE)] pub fn remove_occultation( gs: &mut GameState, - ipieces: &PiecesLoaded, + ipieces: &IPieces, occulter: PieceId, ) -> Vec<(PieceId, PieceUpdateOps)> { let mut aggerr = AggregatedIE::new(); -- 2.30.2