summaryrefslogtreecommitdiff
path: root/server/src/main.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-06-20 02:16:41 +0200
committermetamuffin <metamuffin@disroot.org>2024-06-23 19:21:49 +0200
commitc78665e4fd83a64a67a6747ec9429c74a3d4a466 (patch)
tree6d0714808ca3c3fb9a3ca652770668058f5f89cc /server/src/main.rs
parent935dc832d02ba49ad50cbbaee333ab2dacd3226d (diff)
downloadhurrycurry-c78665e4fd83a64a67a6747ec9429c74a3d4a466.tar
hurrycurry-c78665e4fd83a64a67a6747ec9429c74a3d4a466.tar.bz2
hurrycurry-c78665e4fd83a64a67a6747ec9429c74a3d4a466.tar.zst
generate dot graph from recipes
Diffstat (limited to 'server/src/main.rs')
-rw-r--r--server/src/main.rs11
1 files changed, 3 insertions, 8 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 3af71e17..0f0bac5e 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,7 +1,7 @@
use anyhow::Result;
use futures_util::{SinkExt, StreamExt};
use log::{debug, info, warn};
-use std::{fs::File, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
use tokio::{
io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
net::TcpListener,
@@ -12,8 +12,8 @@ use tokio::{
use tokio_tungstenite::tungstenite::Message;
use undercooked::{
customer::customer,
- data::build_gamedata,
game::Game,
+ load_gamedata,
protocol::{PacketC, PacketS, PlayerID},
};
@@ -28,12 +28,7 @@ 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(),
- serde_yaml::from_reader(File::open("data/map.yaml").unwrap()).unwrap(),
- serde_yaml::from_reader(File::open("data/demands.yaml").unwrap()).unwrap(),
- );
-
+ let data = load_gamedata();
let game = Arc::new(RwLock::new(Game::new(data.into())));
let (tx, rx) = broadcast::channel::<PacketC>(1024);