Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it compile without feature(worldgen)

Browse Source 
+ move settings check to toggling mode segment
This commit is contained in:
juliancoffee
2021-08-28 13:36:33 +03:00
parent 68a4b269d2
commit 1838d151f5
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
server/src/cmd.rs
View File

@ -3108,28 +3108,36 @@ fn handle_battlemode(
) -> CmdResult<()> { ) -> CmdResult<()> {
let ecs = server.state.ecs(); let ecs = server.state.ecs();
let settings = ecs.read_resource::<Settings>(); let settings = ecs.read_resource::<Settings>();
if !settings.battle_mode.allow_choosing() {
return Err("Toggling battlemode is disabled.".to_owned());
}
if let Some(mode) = parse_args!(args, String) { if let Some(mode) = parse_args!(args, String) {
let world = &server.world; if !settings.battle_mode.allow_choosing() {
let index = &server.index; return Err("Toggling battlemode is disabled.".to_owned());
let sim = world.sim();
let pos = position(server, target, "target")?;
let chunk_pos = Vec2::from(pos.0).map(|x: f32| x as i32);
let chunk = sim
.get(chunk_pos)
.ok_or("Cannot get current chunk for target")?;
let site_ids = &chunk.sites;
let mut in_town = false;
for site_id in site_ids.iter() {
let site = index.sites.get(*site_id);
if matches!(site.kind, SiteKind::Settlement(_)) {
in_town = true;
break;
}
} }
#[cfg(feature = "worldgen")]
let in_town = {
let world = &server.world;
let index = &server.index;
let sim = world.sim();
let pos = position(server, target, "target")?;
let chunk_pos = Vec2::from(pos.0).map(|x: f32| x as i32);
let chunk = sim
.get(chunk_pos)
.ok_or("Cannot get current chunk for target")?;
let site_ids = &chunk.sites;
let mut in_town = false;
for site_id in site_ids.iter() {
let site = index.sites.get(*site_id);
if matches!(site.kind, SiteKind::Settlement(_)) {
in_town = true;
break;
}
}
in_town
};
// just skip this check, if worldgen is disabled
#[cfg(not(feature = "worldgen"))]
let in_town = true;
if !in_town { if !in_town {
return Err("You can change battle_mode only in town".to_owned()); return Err("You can change battle_mode only in town".to_owned());
} }