encyclopedia now using serde serialisation too

1 files changed, 2 insertions, 3 deletions

diff --git a/src/worldloader.rs b/src/worldloader.rs
index 414d443..c8738e2 100644
--- a/src/worldloader.rs
+++ b/src/worldloader.rs
@@ -60,15 +60,14 @@ impl WorldLoader {
 	
 	pub fn load_encyclopedia(&self, name: &str) -> Result<Encyclopedia> {
 		let fname: String = name.to_string() + ".json";
-		let encyclopedia = Encyclopedia::from_json(
+		let encyclopedia: Encyclopedia = 
 			serde_json::from_str(
 				&fs::read_to_string(
 					self.directory
 						.join("encyclopediae")
 						.join(&fname)
 				)?
-			)?
-		)?;
+			).map_err(|e|aerr!("failed to load encyclopedia {}: {}", name, e))?;
 		encyclopedia.validate()?;
 		Ok(encyclopedia)
 	}