chiark / gitweb /
Revert "add links to game state"
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jan 2021 01:00:38 +0000 (01:00 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jan 2021 01:00:38 +0000 (01:00 +0000)
This reverts commit 8ea776a18e7e54191a4b10590f4525de12f7d408.

daemon/cmdlistener.rs
src/gamestate.rs
src/global.rs

index b56ae5ffd901c1cb94142c30f1d65ca9805c9188..bb1ecec7865c1677901692384a618bb9e4ad782d 100644 (file)
@@ -160,7 +160,6 @@ fn execute(cs: &mut CommandStream, cmd: MgmtCommand) -> MgmtResponse {
         log: default(),
         gen: Generation(0),
         max_z: default(),
-        links: default(),
       };
 
       let acl = default();
index 4c4a35825dc2448765d5b1a84777cd251bfb85be..7ac57e15bcaa01fefeed3d870ddc443213fb24bf 100644 (file)
@@ -52,7 +52,6 @@ pub struct GameState {
   pub log: VecDeque<(Generation, Arc<CommittedLogEntry>)>,
   pub max_z: ZCoord,
   pub players: DenseSlotMap<PlayerId, GPlayerState>,
-  #[serde(default)] pub links: HashMap<LinkKind, Html>,
 }
 
 #[derive(Debug,Serialize,Deserialize,Clone)]
@@ -84,13 +83,6 @@ pub struct CommittedLogEntry {
   pub logent: LogEntry,
 }
 
-#[derive(Copy,Clone,Debug,Eq,PartialEq,Ord,PartialOrd,Hash)]
-#[derive(Serialize,Deserialize)]
-pub enum LinkKind {
-  Voice,
-  Info,
-}
-
 // ---------- piece trait, and rendering ----------
 
 #[typetag::serde]
index 192cce29ac4450d83da3430623766bcba5fc9012..2c5cc46255f8758f5982f93e2efe0088c374012d 100644 (file)
@@ -559,7 +559,6 @@ impl<'ig> InstanceGuard<'ig> {
       table_size: self.c.g.gs.table_size,
       gen: self.c.g.gs.gen,
       max_z: self.gs.max_z.clone(),
-      links: self.gs.links.clone(),
       players,
       // These have special handling
       log: default(),