equal
deleted
inserted
replaced
1 use std::{ |
1 use std::{ |
2 iter, collections::HashMap |
2 iter, collections::HashMap |
3 }; |
3 }; |
4 use server::{ |
4 use crate::server::{ |
5 coretypes::{ClientId, RoomId, TeamInfo, GameCfg, GameCfg::*, Voting}, |
5 coretypes::{ClientId, RoomId, TeamInfo, GameCfg, GameCfg::*, Voting}, |
6 client::{HWClient} |
6 client::{HWClient} |
7 }; |
7 }; |
8 use serde::{Serialize, Deserialize}; |
8 use serde::{Serialize, Deserialize}; |
9 use serde_yaml; |
9 use serde_yaml; |
69 c.map_generator.to_string(), c.maze_size.to_string(), |
69 c.map_generator.to_string(), c.maze_size.to_string(), |
70 c.seed.to_string(), c.template.to_string()] |
70 c.seed.to_string(), c.template.to_string()] |
71 } |
71 } |
72 |
72 |
73 fn game_config_from(c: &RoomConfig) -> Vec<GameCfg> { |
73 fn game_config_from(c: &RoomConfig) -> Vec<GameCfg> { |
74 use server::coretypes::GameCfg::*; |
74 use crate::server::coretypes::GameCfg::*; |
75 let mut v = vec![ |
75 let mut v = vec![ |
76 Ammo(c.ammo.name.to_string(), c.ammo.settings.clone()), |
76 Ammo(c.ammo.name.to_string(), c.ammo.settings.clone()), |
77 Scheme(c.scheme.name.to_string(), c.scheme.settings.clone()), |
77 Scheme(c.scheme.name.to_string(), c.scheme.settings.clone()), |
78 Script(c.script.to_string()), |
78 Script(c.script.to_string()), |
79 Theme(c.theme.to_string())]; |
79 Theme(c.theme.to_string())]; |