summaryrefslogtreecommitdiff
path: root/src/pos.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/pos.rs
parent3d0d1279627aeee984fa29546aeee6855c9ef2c9 (diff)
added roomtemplate
Diffstat (limited to 'src/pos.rs')
-rw-r--r--src/pos.rs13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/pos.rs b/src/pos.rs
index 12c71bb..3003b64 100644
--- a/src/pos.rs
+++ b/src/pos.rs
@@ -7,14 +7,14 @@ use super::util::{clamp, ToJson};
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub struct Pos {
- pub x: i32,
- pub y: i32
+ pub x: i64,
+ pub y: i64
}
impl Pos {
- pub fn new(x: i32, y: i32) -> Pos {
+ pub fn new(x: i64, y: i64) -> Pos {
Pos {x, y}
}
@@ -24,6 +24,13 @@ impl Pos {
y: clamp(self.y, smaller.y, larger.y)
}
}
+
+ pub fn from_json(val: &Value) -> Option<Self>{
+ Some(Pos {
+ x: val.get(0)?.as_i64()?,
+ y: val.get(1)?.as_i64()?
+ })
+ }
}