From ac04d36a63087570964511239c75e94689affc94 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 9 Jan 2024 17:16:08 +0100
Subject: [PATCH] a

---
 src/chunk-walls.cpp | 26 +++++++++++++-------------
 src/chunk.cpp       |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp
index f8a566be..f523c463 100644
--- a/src/chunk-walls.cpp
+++ b/src/chunk-walls.cpp
@@ -192,7 +192,7 @@ GL::Mesh chunk::make_wall_mesh()
         {
             CORRADE_ASSUME(G < Group_::COUNT);
 
-            bool corner_ok = false, pillar_ok = false;
+            bool corner_ok = false, pillar_ok = false, side_ok = true;
 
             if (!(dir.*member).is_defined)
                 continue;
@@ -204,16 +204,15 @@ GL::Mesh chunk::make_wall_mesh()
                 default:
                     break;
                 case Wall::Group_::side:
-                    if (_walls->atlases[k+1]) // west on same tile
-                        if (auto t2 = at_offset_(pos, {-1, 0}); !t2 || !t2->wall_north_atlas())
-                            if (auto t2 = at_offset_(pos, {0, -1}); !t2 || !t2->wall_west_atlas())
-                                pillar_ok = true;
-                    if (!pillar_ok) [[likely]]
+                    if (auto t = at_offset_(pos, {-1, 0}); !(t && t->wall_north_atlas()))
                     {
-                        if (auto t2 = at_offset_(pos, {-1, 0}); !t2 || !t2->wall_north_atlas())
-                            if (auto t2 = at_offset_(pos, {0, -1}); t2 && t2->wall_west_atlas())
-                                corner_ok = true;
+                        if (_walls->atlases[k+1]) // west on same tile
+                            pillar_ok = true;
+                        if (auto t = at_offset_(pos, {0, -1}); t && t->wall_west_atlas())
+                            corner_ok = true;
                     }
+                    if (auto t = at_offset_(pos, {1, -1}); t && t->wall_west_atlas())
+                        side_ok = false;
                     break;
                 }
             }
@@ -224,11 +223,11 @@ GL::Mesh chunk::make_wall_mesh()
                 default:
                     break;
                 case Wall::Group_::side:
-                    if (auto t2 = at_offset_(pos, {0, 1}); t2 && t2->wall_north_atlas())
-                        continue;
-                    else if (auto t2 = at_offset_(pos, {0, -1}); !t2 || !t2->wall_west_atlas())
-                        if (auto t2 = at_offset_(pos, {-1, 0}); t2 && t2->wall_north_atlas())
+                    if (auto t = at_offset_(pos, {0, -1}); !(t && t->wall_west_atlas()))
+                        if (auto t = at_offset_(pos, {-1, 0}); t && t->wall_north_atlas())
                             corner_ok = true;
+                    if (auto t = at_offset_(pos, {-1, 1}); t && t->wall_north_atlas())
+                        side_ok = false;
                     break;
                 }
             }
@@ -312,6 +311,7 @@ GL::Mesh chunk::make_wall_mesh()
                 }
             }
 
+            if (G != Wall::Group_::side || side_ok) [[likely]]
             {
                 const auto& group = dir.*member;
                 const auto frames = atlas->frames(group);
diff --git a/src/chunk.cpp b/src/chunk.cpp
index 652bd63d..aabb69f8 100644
--- a/src/chunk.cpp
+++ b/src/chunk.cpp
@@ -61,7 +61,7 @@ Optional<tile_ref> chunk::at_offset_(local_coords pos, Vector2i off)
         return operator[](coord2.local());
     else
     {
-        if (auto* ch = _world->at({coord2}))
+        if (auto* ch = _world->at(coord2.chunk3()))
             return (*ch)[coord2.local()];
         else
             return NullOpt;