diff --git a/common/src/assets/mod.rs b/common/src/assets/mod.rs index bc73f50fec..2189cbd2c1 100644 --- a/common/src/assets/mod.rs +++ b/common/src/assets/mod.rs @@ -109,7 +109,7 @@ impl Asset for DotVoxData { impl Asset for Value { fn load(specifier: &str) -> Result { - Ok(serde_json::from_reader(File::open(specifier)?).unwrap()) + Ok(serde_json::from_reader(load_from_path(specifier)?).unwrap()) } } diff --git a/common/src/npc.rs b/common/src/npc.rs index 8864d5d73c..5a14ddaaac 100644 --- a/common/src/npc.rs +++ b/common/src/npc.rs @@ -24,7 +24,7 @@ impl NpcKind { lazy_static! { static ref NPC_NAMES_JSON: Arc = - assets::load_expect("assets/common/npc_names.json"); + assets::load_expect("common/npc_names.json"); } pub fn get_npc_name(npc_type: NpcKind) -> String {