update server to new tile stacks

1 files changed, 14 insertions, 12 deletions

diff --git a/server/src/server.rs b/server/src/server.rs
index bd1d0f86..7d267cad 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -21,8 +21,8 @@ use crate::{
     random_float,
     scoreboard::ScoreboardStore,
 };
-use anyhow::{Context, Result};
-use hurrycurry_data::{Serverdata, index::DataIndex};
+use anyhow::{Context, Result, anyhow};
+use hurrycurry_data::{Serverdata, build_data};
 use hurrycurry_game_core::{Game, Involvement, Item, Player, Tile};
 use hurrycurry_locale::{
     GLOBAL_LOCALE, TrError,
@@ -31,9 +31,7 @@ use hurrycurry_locale::{
 };
 use hurrycurry_protocol::{
     Character, Gamedata, Hand, ItemLocation, Menu, MessageTimeout, PacketC, PacketS, PlayerClass,
-    PlayerID, Score,
-    glam::Vec2,
-    movement::MovementBase,
+    PlayerID, Score, glam::Vec2, movement::MovementBase,
 };
 use log::{info, warn};
 use std::{
@@ -62,6 +60,7 @@ pub enum AnnounceState {
 pub struct ServerConfig {
     pub inactivity_timeout: f32,
     pub lobby: String,
+    pub data_path: PathBuf,
 }
 
 pub struct Server {
@@ -80,23 +79,17 @@ pub struct Server {
     pub packet_loopback: VecDeque<PacketS>,
     pub last_movement_update: HashMap<PlayerID, Instant>,
     pub player_inactivity_timers: HashMap<PlayerID, f32>,
-    pub index: DataIndex,
     pub packet_out: VecDeque<PacketC>,
     pub scoreboard: ScoreboardStore,
     pub editor_address: Option<String>,
 }
 
 impl Server {
-    pub fn new(
-        data_path: PathBuf,
-        config: ServerConfig,
-        tx: broadcast::Sender<PacketC>,
-    ) -> Result<Self> {
+    pub fn new(config: ServerConfig, tx: broadcast::Sender<PacketC>) -> Result<Self> {
         Ok(Self {
             config,
             game: Game::default(),
             tick_perf: (Duration::ZERO, 0),
-            index: DataIndex::new(data_path).context("Failed to load data index")?,
             broadcast: tx,
             announce_state: AnnounceState::Done,
             packet_out: VecDeque::new(),
@@ -116,6 +109,7 @@ impl Server {
 impl Default for ServerConfig {
     fn default() -> Self {
         Self {
+            data_path: "data".into(),
             inactivity_timeout: 60.,
             lobby: "lobby".to_string(),
         }
@@ -352,6 +346,14 @@ impl GameServerExt for Game {
 }
 
 impl Server {
+    pub fn load_map(&mut self, name: &str) -> Result<()> {
+        self.load(
+            build_data(&self.config.data_path, name, true)
+                .context(anyhow!("preparing gamedata for {:?}", name))?,
+            None,
+        );
+        Ok(())
+    }
     pub fn load(
         &mut self,
         (gamedata, serverdata): (Gamedata, Serverdata),