diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs index 6e916fd..77a41a6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -101,9 +101,14 @@ fn main(){ ); println!("content directory: {:?}", content_dir); let loader = WorldLoader::new(content_dir); - let WorldMeta{encyclopedia_name, default_room} = loader.load_world_meta().expect("Failed to load world meta information"); + let WorldMeta{encyclopediae, default_room} = loader.load_world_meta().expect("Failed to load world meta information"); - let encyclopedia = loader.load_encyclopedia(&encyclopedia_name).expect("Failed to load encyclopedia"); + let mut encyclopedia = Encyclopedia::default(); + for enc in encyclopediae { + encyclopedia = encyclopedia.merge( + loader.load_encyclopedia(&enc).expect(&format!("Failed to load encyclopedia {}", enc)) + ) + } let save_dir = config.save_dir.unwrap_or( FileStorage::default_save_dir().expect("couldn't find any save directory") |