From 17e7cb63bf70b35a58cf52ebea4bb543c450320f Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 11 Jul 2024 15:10:39 +0200 Subject: add backwards compat for game jam release --- server/protocol/src/lib.rs | 6 +++++- server/src/game.rs | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'server') diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs index cb72d2ff..2287633d 100644 --- a/server/protocol/src/lib.rs +++ b/server/protocol/src/lib.rs @@ -17,7 +17,10 @@ */ use glam::{IVec2, Vec2}; use serde::{Deserialize, Serialize}; -use std::{collections::HashMap, fmt::Display}; +use std::{ + collections::{HashMap, HashSet}, + fmt::Display, +}; pub use glam; @@ -52,6 +55,7 @@ pub struct ClientGamedata { pub tile_names: Vec, pub tile_collide: Vec, pub tile_interact: Vec, + pub map_names: HashSet, // for compat with game jam version pub maps: HashMap, } diff --git a/server/src/game.rs b/server/src/game.rs index f196fd1f..1c50c7c2 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -169,6 +169,14 @@ impl Game { tile_names: self.data.tile_names.clone(), tile_collide: self.data.tile_collide.clone(), tile_interact: self.data.tile_interact.clone(), + map_names: self + .data + .map + .clone() + .keys() + .filter(|n| n.as_str() != "lobby") + .map(|s| s.to_owned()) + .collect(), maps: self .data .map -- cgit v1.2.3-70-g09d2