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

Remove 'use subpath as subtype' imports

Browse source
This commit is contained in:
Tad Hardesty 2019-11-17 10:37:34 -08:00
parent 8533f478a4
commit 3d673541d1
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tools/minimap.rs
View file

@ -4,7 +4,6 @@ use std::collections::HashSet;
use ndarray::Axis;
use dm::objtree::*;
use dm::objtree::subpath as subtype;
use dm::constants::Constant;
use dmm::{Map, Grid, Prefab};
use dmi::Image;
@ -79,7 +78,7 @@ pub fn generate(ctx: Context, icon_cache: &IconCache) -> Result<Image, ()> {
// icons which differ from their map states
let p = &atom.type_.path;
if subtype(p, "/turf/closed/mineral/") {
if subpath(p, "/turf/closed/mineral/") {
atom.sprite.ofs_x -= 4;
atom.sprite.ofs_y -= 4;
}

23
src/tools/render_passes/mod.rs
View file

@ -403,28 +403,27 @@ fn unary_aboveground(atom: &Atom, objtree: &ObjectTree) -> Option<&'static str>
}
fn fancy_layer_for_path(p: &str) -> Option<Layer> {
use dm::objtree::subpath as subtype;
Some(if subtype(p, "/turf/open/floor/plating/") || subtype(p, "/turf/open/space/") {
Some(if subpath(p, "/turf/open/floor/plating/") || subpath(p, "/turf/open/space/") {
Layer::from(-10) // under everything
} else if subtype(p, "/turf/closed/mineral/") {
} else if subpath(p, "/turf/closed/mineral/") {
Layer::from(-3) // above hidden stuff and plating but below walls
} else if subtype(p, "/turf/open/floor/") || subtype(p, "/turf/closed/") {
} else if subpath(p, "/turf/open/floor/") || subpath(p, "/turf/closed/") {
Layer::from(-2) // above hidden pipes and wires
} else if subtype(p, "/turf/") {
} else if subpath(p, "/turf/") {
Layer::from(-10) // under everything
} else if subtype(p, "/obj/effect/turf_decal/") {
} else if subpath(p, "/obj/effect/turf_decal/") {
Layer::from(-1) // above turfs
} else if subtype(p, "/obj/structure/disposalpipe/") {
} else if subpath(p, "/obj/structure/disposalpipe/") {
Layer::from(-6)
} else if subtype(p, "/obj/machinery/atmospherics/pipe/") && !p.contains("visible") {
} else if subpath(p, "/obj/machinery/atmospherics/pipe/") && !p.contains("visible") {
Layer::from(-5)
} else if subtype(p, "/obj/structure/cable/") {
} else if subpath(p, "/obj/structure/cable/") {
Layer::from(-4)
} else if subtype(p, "/obj/machinery/power/terminal/") {
} else if subpath(p, "/obj/machinery/power/terminal/") {
Layer::from(-3.5)
} else if subtype(p, "/obj/structure/lattice/") {
} else if subpath(p, "/obj/structure/lattice/") {
Layer::from(-8)
} else if subtype(p, "/obj/machinery/navbeacon/") {
} else if subpath(p, "/obj/machinery/navbeacon/") {
Layer::from(-3)
} else {
return None