From ceb3eff116f9ddf8dcb71a0a77efb63531f75ab2 Mon Sep 17 00:00:00 2001 From: Tom Barrett Date: Wed, 2 Feb 2022 19:08:44 +0100 Subject: 2022 update --- src/map.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/map.rs') diff --git a/src/map.rs b/src/map.rs index 9bb3b47..7f1e3d7 100644 --- a/src/map.rs +++ b/src/map.rs @@ -1,6 +1,6 @@ use ggez::filesystem::File; use ggez::graphics::spritebatch::SpriteBatch; -use ggez::nalgebra::Point2; +use glam; use std::collections::HashMap; use xml::reader::XmlEvent::Characters; @@ -16,7 +16,7 @@ use crate::xmlelements::XMLElements; pub struct Map { dimensions: (usize, usize), layers: Vec, - spawns: Vec<(String, Point2)>, + spawns: Vec<(String, glam::Vec2)>, } impl Operable for Map { @@ -74,7 +74,7 @@ impl Map { fn find_spawn_points( layers: &[Layer], spawn_tiles: HashMap, - ) -> Vec<(String, Point2)> { + ) -> Vec<(String, glam::Vec2)> { let mut spawn_points = Vec::new(); for layer in layers.iter() { @@ -91,7 +91,7 @@ impl Map { spawn_points } - pub fn get_spawn_points(&self, character: Character) -> Vec> { + pub fn get_spawn_points(&self, character: Character) -> Vec { self.spawns .clone() .into_iter() -- cgit v1.2.3