summaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-02-07 19:10:13 +0100
committertroido <troido@protonmail.com>2020-02-07 19:10:13 +0100
commit940b1c762bb98a56dddc6e3e7f208867abb3ebe5 (patch)
treef0535ace5a5a9643fb735f1970fa1b338ec9fea9 /src/main.rs
parent3d0d1279627aeee984fa29546aeee6855c9ef2c9 (diff)
added roomtemplate
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs
index 1f1d217..410a9aa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,6 +22,7 @@ mod assemblage;
mod componentparameter;
mod encyclopedia;
mod template;
+mod roomtemplate;
use self::gameserver::GameServer;
use self::server::unixserver::UnixServer;
@@ -31,7 +32,7 @@ use self::room::Room;
use self::util::ToJson;
use self::encyclopedia::Encyclopedia;
use self::template::Template;
-use self::pos::Pos;
+pub use self::pos::Pos;
@@ -64,7 +65,7 @@ fn main() {
}
}
-fn gen_room<'a, 'b>(width: i32, height: i32) -> Room<'a, 'b> {
+fn gen_room<'a, 'b>(width: i64, height: i64) -> Room<'a, 'b> {
let assemblages = default_assemblages();
let mut room = Room::new(assemblages.clone(), (width, height));
let wall = &Template::empty("wall");