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

Merge branch 'assets-bug-fix' into 'master'

Browse Source 
Fixed bug in loading JSON assets

See merge request veloren/veloren!210
This commit is contained in:
Joshua Barretto 2019-06-04 12:39:46 +00:00
commit c8c07d2783
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/assets/mod.rs
View File

@ -109,7 +109,7 @@ impl Asset for DotVoxData {
impl Asset for Value {
fn load(specifier: &str) -> Result<Self, Error> {
Ok(serde_json::from_reader(File::open(specifier)?).unwrap())
Ok(serde_json::from_reader(load_from_path(specifier)?).unwrap())
}
}

2
common/src/npc.rs
View File

@ -24,7 +24,7 @@ impl NpcKind {
lazy_static! {
static ref NPC_NAMES_JSON: Arc<serde_json::Value> =
assets::load_expect("assets/common/npc_names.json");
assets::load_expect("common/npc_names.json");
}
pub fn get_npc_name(npc_type: NpcKind) -> String {