Merge pull request #258 from mapeditor/current

Merge current into next
mapeditor · Mar 16, 2023 · 6dff214 · 6dff214
2 parents 552e800 + 4f1a930
commit 6dff214
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/layers/tile/finite.rs b/src/layers/tile/finite.rs
@@ -85,7 +85,7 @@ impl<'map> FiniteTileLayer<'map> {
     /// Obtains the tile present at the position given.
     ///
     /// If the position given is invalid or the position is empty, this function will return [`None`].
-    pub fn get_tile(&self, x: i32, y: i32) -> Option<LayerTile> {
+    pub fn get_tile(&self, x: i32, y: i32) -> Option<LayerTile<'map>> {
         self.data
             .get_tile_data(x, y)
             .map(|data| LayerTile::new(self.map(), data))

diff --git a/src/layers/tile/infinite.rs b/src/layers/tile/infinite.rs
@@ -218,7 +218,7 @@ impl<'map> InfiniteTileLayer<'map> {
     /// Obtains the tile present at the position given.
     ///
     /// If the position is empty, this function will return [`None`].
-    pub fn get_tile(&self, x: i32, y: i32) -> Option<LayerTile> {
+    pub fn get_tile(&self, x: i32, y: i32) -> Option<LayerTile<'map>> {
         self.data
             .get_tile_data(x, y)
             .map(|data| LayerTile::new(self.map, data))

diff --git a/src/layers/tile/mod.rs b/src/layers/tile/mod.rs
@@ -167,7 +167,7 @@ impl<'map> TileLayer<'map> {
     /// Obtains the tile present at the position given.
     ///
     /// If the position given is invalid or the position is empty, this function will return [`None`].
-    pub fn get_tile(&self, x: i32, y: i32) -> Option<LayerTile> {
+    pub fn get_tile(&self, x: i32, y: i32) -> Option<LayerTile<'map>> {
         match self {
             TileLayer::Finite(finite) => finite.get_tile(x, y),
             TileLayer::Infinite(infinite) => infinite.get_tile(x, y),