piece API: rename save_reloaded_hook

This is clearer, given that we have load() for turning a spec into a
loaded piece.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/clock.rs b/src/clock.rs
index f679be155768149176da7aff0174d14251886a02..b3c5da3c4bead49443381af2fd72f3d6e6ac78c7 100644 (file)
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -743,8 +743,8 @@ impl PieceTrait for Clock {
   }
 
   #[throws(IE)]
-  fn loaded_hook(&self, piece: PieceId, gs: &mut GameState,
-                 ig: &InstanceRef) {
+  fn save_reloaded_hook(&self, piece: PieceId, gs: &mut GameState,
+                        ig: &InstanceRef) {
     // The effect of this is to reload to the amount remaining at the
     // last game save.  That's probably tolerable, and even arguably
     // better than having the clock "have kept running" during the

diff --git a/src/dice.rs b/src/dice.rs
index 8fc587b099e92579352b918d421b752e2858fefd..014182dfdbc3119e1dce4a33ed6c224e623a59f0 100644 (file)
--- a/src/dice.rs
+++ b/src/dice.rs
@@ -420,7 +420,8 @@ impl PieceTrait for Die {
   }
 
   #[throws(IE)]
-  fn loaded_hook(&self, piece: PieceId, gs: &mut GameState, _: &InstanceRef) {
+  fn save_reloaded_hook(&self, piece: PieceId, gs: &mut GameState
+                        , _: &InstanceRef) {
     self.cooldown_cleanup_hook(&mut gs.pieces, piece)?;
   }
 }

diff --git a/src/gamestate.rs b/src/gamestate.rs
index e215250faa0dddb6ffaa65885e1994431f249292..79ccca91ca12248d0cd540cf7f5c5c1dfa4b0585 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -230,7 +230,7 @@ pub trait PieceTrait: PieceBaseTrait + Downcast + Send + Debug + 'static {
                       _was_held: Option<PlayerId>)
                       -> Result<OpHookThunk,IE> { Ok(default()) }
 
-  fn loaded_hook(&self, _piece: PieceId,
+  fn save_reloaded_hook(&self, _piece: PieceId,
                  _gs: &mut GameState, _ig: &InstanceRef) -> Result<(),IE> {
     Ok(())
   }

diff --git a/src/global.rs b/src/global.rs
index 115345f872f95703ff09bfe3e0fdab9d71d2a67d..1819851447bd8e38403bdbfb0bc9281d809be365 100644 (file)
--- a/src/global.rs
+++ b/src/global.rs
@@ -1337,7 +1337,8 @@ impl InstanceGuard<'_> {
 
     let ig = &mut *g;
     for (piece, ipc) in ig.ipieces.0.iter() {
-      ipc.direct_trait_access().loaded_hook(piece, &mut ig.gs, &gref)?;
+      ipc.direct_trait_access()
+        .save_reloaded_hook(piece, &mut ig.gs, &gref)?;
     }
 
     for (token, _) in &tokens_players {