From 38b5c32b1037602068285dc3ad906cc7b94cdcb4 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 3 Dec 2022 08:18:55 +0100
Subject: kill compat/optional

---
 editor/app.hpp    | 2 +-
 editor/camera.cpp | 4 ++--
 editor/draw.cpp   | 4 ++--
 editor/editor.hpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'editor')

diff --git a/editor/app.hpp b/editor/app.hpp
index 25391d62..8d4f0736 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -13,7 +13,7 @@
 #include <memory>
 
 #include <Corrade/Containers/Pointer.h>
-#include "compat/optional.hpp"
+#include <Corrade/Containers/Optional.h>
 #include <Magnum/ImGuiIntegration/Context.h>
 
 namespace floormat {
diff --git a/editor/camera.cpp b/editor/camera.cpp
index d7fc8695..2df3dd20 100644
--- a/editor/camera.cpp
+++ b/editor/camera.cpp
@@ -59,8 +59,8 @@ void app::reset_camera_offset()
 void app::update_cursor_tile(const Optional<Vector2i>& pixel)
 {
     cursor.pixel = pixel;
-    if (const auto [p, b] = pixel; b)
-        cursor.tile = M->pixel_to_tile(Vector2d{p});
+    if (pixel)
+        cursor.tile = M->pixel_to_tile(Vector2d{*pixel});
     else
         cursor.tile = NullOpt;
 }
diff --git a/editor/draw.cpp b/editor/draw.cpp
index 339e0f6c..275d99fc 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -18,9 +18,9 @@ void app::draw_cursor()
     shader.set_tint({1, 0, 0, 1});
     const auto inactive_color = 0xff00ffff_rgbaf;
 
-    if (const auto [pos, b] = cursor.tile; b && !cursor.in_imgui)
+    if (cursor.tile && !cursor.in_imgui)
     {
-        const auto draw = [&, pos = pos](auto& mesh, const auto& size) {
+        const auto draw = [&, pos = *cursor.tile](auto& mesh, const auto& size) {
             const auto pt = pos.to_signed();
             const Vector3 center{Vector3i(pt[0], pt[1], 0) * iTILE_SIZE};
             mesh.draw(shader, {center, size, LINE_WIDTH});
diff --git a/editor/editor.hpp b/editor/editor.hpp
index eac544ad..d9d4d386 100644
--- a/editor/editor.hpp
+++ b/editor/editor.hpp
@@ -9,7 +9,7 @@
 
 #include <map>
 #include <memory>
-#include "compat/optional.hpp"
+#include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/StringView.h>
 
 namespace floormat {
-- 
cgit v1.2.3