summaryrefslogtreecommitdiff
path: root/src/worldmessages.rs
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-02-21 19:43:43 +0100
committertroido <troido@protonmail.com>2020-02-21 19:43:43 +0100
commit1f85c11d0ebb0a879b7825b8e78e473a77d8b778 (patch)
treea1d4d274bd107bddefa425fdf255cbdc123cd904 /src/worldmessages.rs
parent4ed2d71e76f04c75a214e43363dc1b64e109fe3d (diff)
sprites are not strings anymore
Diffstat (limited to 'src/worldmessages.rs')
-rw-r--r--src/worldmessages.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/worldmessages.rs b/src/worldmessages.rs
index 39eee6a..2e80763 100644
--- a/src/worldmessages.rs
+++ b/src/worldmessages.rs
@@ -1,8 +1,9 @@
use serde_json::{Value, json};
use serde::Serialize;
-use super::util::ToJson;
-use super::pos::Pos;
+use crate::util::ToJson;
+use crate::{Pos, Sprite};
+
#[derive(Debug, Clone)]
pub struct WorldMessage {
@@ -20,7 +21,7 @@ impl ToJson for WorldMessage {
pub enum WorldUpdate {
Field(FieldMessage),
Pos(Pos),
- Change(Vec<(Pos, Vec<String>)>),
+ Change(Vec<(Pos, Vec<Sprite>)>),
Inventory(Vec<String>),
Health(i64, i64)
}
@@ -42,7 +43,7 @@ pub struct FieldMessage {
pub width: i64,
pub height: i64,
pub field: Vec<usize>,
- pub mapping: Vec<Vec<String>>
+ pub mapping: Vec<Vec<Sprite>>
}