language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split fancy_layer_of into two functions

Browse source
This commit is contained in:
Tad Hardesty 2019-11-16 14:13:03 -08:00
parent b7598f73ff
commit 6f79a55b27
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tools/minimap.rs
View file

@ -554,8 +554,14 @@ pub fn color_of<T: GetVar + ?Sized>(objtree: &ObjectTree, atom: &T) -> [u8; 4] {
}
fn fancy_layer_of<T: GetVar + ?Sized>(objtree: &ObjectTree, atom: &T) -> i32 {
let p = atom.get_path();
if subtype(p, "/turf/open/floor/plating/") || subtype(p, "/turf/open/space/") {
match fancy_layer_for_path(atom.get_path()) {
Some(layer) => layer,
None => layer_of(objtree, atom),
}
}
pub fn fancy_layer_for_path(p: &str) -> Option<i32> {
Some(if subtype(p, "/turf/open/floor/plating/") || subtype(p, "/turf/open/space/") {
-10_000 // under everything
} else if subtype(p, "/turf/closed/mineral/") {
-3_000 // above hidden stuff and plating but below walls
@ -578,8 +584,8 @@ fn fancy_layer_of<T: GetVar + ?Sized>(objtree: &ObjectTree, atom: &T) -> i32 {
} else if subtype(p, "/obj/machinery/navbeacon/") {
-3_000
} else {
layer_of(objtree, atom)
}
return None
})
}
// ----------------------------------------------------------------------------