diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-06-18 13:28:31 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-23 19:21:22 +0200 |
| commit | 3d870a714348defc40cd519c00b43c87b1be6480 (patch) | |
| tree | 5e013dff20bcb41594dbe168f83b32f0f616aa26 /server/src/main.rs | |
| parent | fdcf100f756f5d2fe8550705a2a10124bfa1c021 (diff) | |
| download | hurrycurry-3d870a714348defc40cd519c00b43c87b1be6480.tar hurrycurry-3d870a714348defc40cd519c00b43c87b1be6480.tar.bz2 hurrycurry-3d870a714348defc40cd519c00b43c87b1be6480.tar.zst | |
load map from file
Diffstat (limited to 'server/src/main.rs')
| -rw-r--r-- | server/src/main.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index d747e737..5414e9fd 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -27,8 +27,10 @@ async fn main() -> Result<()> { ); info!("listening for websockets on {}", ws_listener.local_addr()?); - let data = - build_gamedata(serde_yaml::from_reader(File::open("data/recipes.yaml").unwrap()).unwrap()); + let data = build_gamedata( + serde_yaml::from_reader(File::open("data/recipes.yaml").unwrap()).unwrap(), + serde_yaml::from_reader(File::open("data/map.yaml").unwrap()).unwrap(), + ); let game = Arc::new(RwLock::new(Game::new(data.into()))); let (tx, rx) = broadcast::channel::<PacketC>(1024); |