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

Pass SiteKind by reference.

Browse Source
This commit is contained in:
Tormod G. Hellen 2023-05-29 18:52:21 +02:00
parent 1d0329cfa7
commit 4f2548fe78
No known key found for this signature in database
GPG Key ID: 13F76F45CB334E5B
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
world/src/civ/mod.rs
View File

@ -267,7 +267,7 @@ impl Civs {
.avoid_all_of(this.castle_enemies(), 40)
.close_to_one_of(this.towns(), 20)
.finalize(&world_dims),
SiteKind::Castle,
&SiteKind::Castle,
)?,
SiteKind::Castle,
),
@ -279,7 +279,7 @@ impl Civs {
&ProximityRequirementsBuilder::new()
.avoid_all_of(this.tree_enemies(), 40)
.finalize(&world_dims),
SiteKind::GiantTree,
&SiteKind::GiantTree,
)?,
SiteKind::GiantTree,
)
@ -290,7 +290,7 @@ impl Civs {
&ProximityRequirementsBuilder::new()
.avoid_all_of(this.tree_enemies(), 40)
.finalize(&world_dims),
SiteKind::Tree,
&SiteKind::Tree,
)?,
SiteKind::Tree,
)
@ -302,7 +302,7 @@ impl Civs {
&ProximityRequirementsBuilder::new()
.avoid_all_of(this.gnarling_enemies(), 40)
.finalize(&world_dims),
SiteKind::Gnarling,
&SiteKind::Gnarling,
)?,
SiteKind::Gnarling,
),
@ -313,7 +313,7 @@ impl Civs {
&ProximityRequirementsBuilder::new()
.avoid_all_of(this.chapel_site_enemies(), 40)
.finalize(&world_dims),
SiteKind::ChapelSite,
&SiteKind::ChapelSite,
)?,
SiteKind::ChapelSite,
),
@ -323,7 +323,7 @@ impl Civs {
&ProximityRequirementsBuilder::new()
.avoid_all_of(this.gnarling_enemies(), 40)
.finalize(&world_dims),
SiteKind::Adlet,
&SiteKind::Adlet,
)?,
SiteKind::Adlet,
),
@ -333,7 +333,7 @@ impl Civs {
&ProximityRequirementsBuilder::new()
.avoid_all_of(this.dungeon_enemies(), 40)
.finalize(&world_dims),
SiteKind::Dungeon,
&SiteKind::Dungeon,
)?,
SiteKind::Dungeon,
),
@ -800,7 +800,7 @@ impl Civs {
let avoid_town_enemies = ProximityRequirementsBuilder::new()
.avoid_all_of(self.town_enemies(), 60)
.finalize(&world_dims);
let loc = find_site_loc(ctx, &avoid_town_enemies, kind)?;
let loc = find_site_loc(ctx, &avoid_town_enemies, &kind)?;
Some(self.establish_site(ctx, loc, |place| Site {
kind,
site_tmp: None,
@ -1531,7 +1531,7 @@ fn loc_suitable_for_walking(sim: &WorldSim, loc: Vec2<i32>) -> bool {
fn find_site_loc(
ctx: &mut GenCtx<impl Rng>,
proximity_reqs: &ProximityRequirements,
site_kind: SiteKind,
site_kind: &SiteKind,
) -> Option<Vec2<i32>> {
prof_span!("find_site_loc");
const MAX_ATTEMPTS: usize = 10000;