wipshit

1 files changed, 14 insertions, 14 deletions

diff --git a/src/tile.cpp b/src/tile.cpp
index 53ae88b3..0a365f35 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -13,22 +13,22 @@ bool operator==(const tile_proto& a, const tile_proto& b) noexcept {
 };
 
 tile_image_proto tile_proto::ground() const noexcept     { return { ground_atlas, ground_variant         }; }
-tile_image_proto tile_proto::wall_north() const noexcept { return { wall_north_atlas, wall_north_variant }; }
-tile_image_proto tile_proto::wall_west() const noexcept  { return { wall_west_atlas, wall_west_variant   }; }
+wall_image_proto tile_proto::wall_north() const noexcept { return { wall_north_atlas, wall_north_variant }; }
+wall_image_proto tile_proto::wall_west() const noexcept  { return { wall_west_atlas, wall_west_variant   }; }
 
 tile_ref::tile_ref(struct chunk& c, uint8_t i) noexcept : _chunk{&c}, i{i} {}
 
 std::shared_ptr<tile_atlas> tile_ref::ground_atlas()     noexcept { return _chunk->_ground ? _chunk->_ground->_ground_atlases[i] : nullptr; }
-std::shared_ptr<tile_atlas> tile_ref::wall_north_atlas() noexcept { return _chunk->_walls ? _chunk->_walls->_wall_atlases[i*2+0] : nullptr; }
-std::shared_ptr<tile_atlas> tile_ref::wall_west_atlas()  noexcept { return _chunk->_walls ? _chunk->_walls->_wall_atlases[i*2+1] : nullptr; }
+std::shared_ptr<wall_atlas> tile_ref::wall_north_atlas() noexcept { return _chunk->_walls ? _chunk->_walls->atlases[i*2+0] : nullptr; }
+std::shared_ptr<wall_atlas> tile_ref::wall_west_atlas()  noexcept { return _chunk->_walls ? _chunk->_walls->atlases[i*2+1] : nullptr; }
 
 std::shared_ptr<const tile_atlas> tile_ref::ground_atlas()      const noexcept { return _chunk->_ground ? _chunk->_ground->_ground_atlases[i] : nullptr; }
-std::shared_ptr<const tile_atlas> tile_ref::wall_north_atlas()  const noexcept { return _chunk->_walls ? _chunk->_walls->_wall_atlases[i*2+0] : nullptr; }
-std::shared_ptr<const tile_atlas> tile_ref::wall_west_atlas()   const noexcept { return _chunk->_walls ? _chunk->_walls->_wall_atlases[i*2+1] : nullptr; }
+std::shared_ptr<const wall_atlas> tile_ref::wall_north_atlas()  const noexcept { return _chunk->_walls ? _chunk->_walls->atlases[i*2+0] : nullptr; }
+std::shared_ptr<const wall_atlas> tile_ref::wall_west_atlas()   const noexcept { return _chunk->_walls ? _chunk->_walls->atlases[i*2+1] : nullptr; }
 
 tile_image_ref tile_ref::ground() noexcept     { _chunk->ensure_alloc_ground(); return {_chunk->_ground->_ground_atlases[i], _chunk->_ground->_ground_variants[i] };     }
-tile_image_ref tile_ref::wall_north() noexcept { _chunk->ensure_alloc_walls(); return {_chunk->_walls->_wall_atlases[i*2+0], _chunk->_walls->_wall_variants[i*2+0] }; }
-tile_image_ref tile_ref::wall_west() noexcept  { _chunk->ensure_alloc_walls(); return {_chunk->_walls->_wall_atlases[i*2+1],  _chunk->_walls->_wall_variants[i*2+1] };  }
+wall_image_ref tile_ref::wall_north() noexcept { _chunk->ensure_alloc_walls(); return {_chunk->_walls->atlases[i*2+0], _chunk->_walls->variants[i*2+0] }; }
+wall_image_ref tile_ref::wall_west() noexcept  { _chunk->ensure_alloc_walls(); return {_chunk->_walls->atlases[i*2+1],  _chunk->_walls->variants[i*2+1] };  }
 
 tile_image_proto tile_ref::ground() const noexcept
 {
@@ -36,16 +36,16 @@ tile_image_proto tile_ref::ground() const noexcept
     return { _chunk->_ground->_ground_atlases[i], _chunk->_ground->_ground_variants[i] };
 }
 
-tile_image_proto tile_ref::wall_north() const noexcept
+wall_image_proto tile_ref::wall_north() const noexcept
 {
     _chunk->ensure_alloc_walls();
-    return { _chunk->_walls->_wall_atlases[i*2+0], _chunk->_walls->_wall_variants[i*2+0] };
+    return { _chunk->_walls->atlases[i*2+0], _chunk->_walls->variants[i*2+0] };
 }
 
-tile_image_proto tile_ref::wall_west() const noexcept
+wall_image_proto tile_ref::wall_west() const noexcept
 {
     _chunk->ensure_alloc_walls();
-    return { _chunk->_walls->_wall_atlases[i*2+1],  _chunk->_walls->_wall_variants[i*2+1] };
+    return { _chunk->_walls->atlases[i*2+1],  _chunk->_walls->variants[i*2+1] };
 }
 
 tile_ref::operator tile_proto() const noexcept
@@ -53,8 +53,8 @@ tile_ref::operator tile_proto() const noexcept
     _chunk->ensure_alloc_ground();
     _chunk->ensure_alloc_walls();
     return {
-        _chunk->_ground->_ground_atlases[i],  _chunk->_walls->_wall_atlases[i*2+0],  _chunk->_walls->_wall_atlases[i*2+1],
-        _chunk->_ground->_ground_variants[i], _chunk->_walls->_wall_variants[i*2+0], _chunk->_walls->_wall_variants[i*2+1],
+        _chunk->_ground->_ground_atlases[i],  _chunk->_walls->atlases[i*2+0],  _chunk->_walls->atlases[i*2+1],
+        _chunk->_ground->_ground_variants[i], _chunk->_walls->variants[i*2+0], _chunk->_walls->variants[i*2+1],
     };
 }