From 42448500c1c2e3dd5d6a0a62c59f1f0367c12b04 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Tue, 3 Mar 2020 19:52:11 +0100
Subject: moved default encyclopedia to data file

---
 src/worldloader.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/worldloader.rs')

diff --git a/src/worldloader.rs b/src/worldloader.rs
index d8a7c0f..2d7ae69 100644
--- a/src/worldloader.rs
+++ b/src/worldloader.rs
@@ -1,5 +1,5 @@
 
-use std::path::PathBuf;
+use std::path::{PathBuf};
 use std::fs;
 use serde_json;
 use serde_json::Value;
@@ -22,9 +22,8 @@ impl WorldLoader {
 	}
 	
 	pub fn load_room(&self, id: RoomId) -> Result<RoomTemplate> {
-		let mut path = self.directory.clone();
 		let fname = id.to_string() + ".json";
-		path.push(fname);
+		let path = self.directory.join(fname);
 		let text = fs::read_to_string(path)?;
 		let json: Value = serde_json::from_str(&text)?;
 		let template = RoomTemplate::from_json(&json)?;
-- 
cgit