From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 8 Jul 2020 01:20:22 +0000 (+0100)
Subject: record raised
X-Git-Tag: otter-0.2.0~1401
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5e3d30f61ffbfbf0985531ee3e50772ccad7bb49;p=otter.git

record raised
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 332b5a74..d6d47d4c 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -84,7 +84,12 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
 
     let mut uses = vec![];
     let mut alldefs = vec![];
-    for (gpid, pr) in &ig.gs.pieces {
+
+    let mut pieces : Vec<_> = ig.gs.pieces.iter().collect();
+
+    pieces.sort_by_key(|(_,pr)| !pr.raised.0);
+
+    for (gpid, pr) in pieces {
       let pri = PieceRenderInstructions {
         id : make_pieceid_visible(gpid),
         face : pr.face,
diff --git a/src/gamestate.rs b/src/gamestate.rs
index 20d3decf..5a672dab 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -53,6 +53,7 @@ pub struct PieceRecord {
   pub p : Box<dyn Piece>,
   pub face : FaceId,
   pub held : Option<PlayerId>,
+  pub raised : Generation,
   pub gen : Generation,
   pub lastclient : ClientId,
   pub gen_before_lastclient : Generation,
@@ -119,17 +120,20 @@ pub struct LogEntry {
 
 pub fn xxx_gamestate_init() -> GameState {
   let mut pieces = DenseSlotMap::with_key();
+  let mut gen = Generation(0);
   for (pos, p) in xxx_make_pieces() {
     let pr = PieceRecord {
       pos, p,
       face : 0.into(),
       held : None,
       lastclient : Default::default(),
-      gen : Generation(0),
+      raised: Generation(0),
+      gen,
       gen_before_lastclient : Generation(0),
     };
+    gen.increment();
     pieces.insert(pr);
   }
-  GameState { pieces, gen : Generation(1), players : Default::default(),
+  GameState { pieces, gen, players : Default::default(),
               log : Default::default(), }
 }