From a2246d2b71995deaedb463d4a33320ceee695fc2 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" <zed.shaw@gmail.com> Date: Fri, 16 May 2025 00:07:24 -0400 Subject: [PATCH] Move the map_view and mini_map into gui as well. --- gui/fsm.hpp | 4 ++-- map_view.cpp => gui/map_view.cpp | 0 map_view.hpp => gui/map_view.hpp | 0 mini_map.cpp => gui/mini_map.cpp | 0 mini_map.hpp => gui/mini_map.hpp | 0 meson.build | 7 +++---- 6 files changed, 5 insertions(+), 6 deletions(-) rename map_view.cpp => gui/map_view.cpp (100%) rename map_view.hpp => gui/map_view.hpp (100%) rename mini_map.cpp => gui/mini_map.cpp (100%) rename mini_map.hpp => gui/mini_map.hpp (100%) diff --git a/gui/fsm.hpp b/gui/fsm.hpp index 75fc169..a70c64f 100644 --- a/gui/fsm.hpp +++ b/gui/fsm.hpp @@ -9,8 +9,8 @@ #include "gui/status_ui.hpp" #include "gui/loot_ui.hpp" #include "gui/boss_fight_ui.hpp" -#include "map_view.hpp" -#include "mini_map.hpp" +#include "gui/map_view.hpp" +#include "gui/mini_map.hpp" namespace gui { enum class State { diff --git a/map_view.cpp b/gui/map_view.cpp similarity index 100% rename from map_view.cpp rename to gui/map_view.cpp diff --git a/map_view.hpp b/gui/map_view.hpp similarity index 100% rename from map_view.hpp rename to gui/map_view.hpp diff --git a/mini_map.cpp b/gui/mini_map.cpp similarity index 100% rename from mini_map.cpp rename to gui/mini_map.cpp diff --git a/mini_map.hpp b/gui/mini_map.hpp similarity index 100% rename from mini_map.hpp rename to gui/mini_map.hpp diff --git a/meson.build b/meson.build index da2a8de..28bc46b 100644 --- a/meson.build +++ b/meson.build @@ -96,10 +96,12 @@ sources = [ 'gui/boss_fight_ui.cpp', 'gui/combat_ui.cpp', 'gui/debug_ui.cpp', - 'gui/guecstra.cpp', 'gui/fsm.cpp', + 'gui/guecstra.cpp', 'gui/loot_ui.cpp', 'gui/main_ui.cpp', + 'gui/map_view.cpp', + 'gui/mini_map.cpp', 'gui/overlay_ui.cpp', 'gui/ritual_ui.cpp', 'gui/status_ui.cpp', @@ -107,10 +109,7 @@ sources = [ 'levelmanager.cpp', 'lights.cpp', 'map.cpp', - 'map_view.cpp', - 'matrix.cpp', 'matrix.cpp', - 'mini_map.cpp', 'pathing.cpp', 'rand.cpp', 'raycaster.cpp',