Move the guecstra stuff into the gui.

master
Zed A. Shaw 2 days ago
parent dfc6aa08e9
commit cc44c9d37a
  1. 2
      gui/combat_ui.cpp
  2. 2
      gui/guecstra.cpp
  3. 0
      gui/guecstra.hpp
  4. 2
      gui/loot_ui.cpp
  5. 20
      meson.build

@ -2,7 +2,7 @@
#include "constants.hpp" #include "constants.hpp"
#include "rituals.hpp" #include "rituals.hpp"
#include <fmt/xchar.h> #include <fmt/xchar.h>
#include "guecstra.hpp" #include "gui/guecstra.hpp"
namespace gui { namespace gui {
using namespace guecs; using namespace guecs;

@ -1,4 +1,4 @@
#include "guecstra.hpp" #include "gui/guecstra.hpp"
namespace guecs { namespace guecs {

@ -1,7 +1,7 @@
#include "gui/loot_ui.hpp" #include "gui/loot_ui.hpp"
#include "constants.hpp" #include "constants.hpp"
#include <fmt/xchar.h> #include <fmt/xchar.h>
#include "guecstra.hpp" #include "gui/guecstra.hpp"
namespace gui { namespace gui {
using namespace guecs; using namespace guecs;

@ -93,7 +93,16 @@ sources = [
'dbc.cpp', 'dbc.cpp',
'devices.cpp', 'devices.cpp',
'goap.cpp', 'goap.cpp',
'guecstra.cpp', 'gui/boss_fight_ui.cpp',
'gui/combat_ui.cpp',
'gui/debug_ui.cpp',
'gui/guecstra.cpp',
'gui/gui_fsm.cpp',
'gui/loot_ui.cpp',
'gui/main_ui.cpp',
'gui/overlay_ui.cpp',
'gui/ritual_ui.cpp',
'gui/status_ui.cpp',
'inventory.cpp', 'inventory.cpp',
'levelmanager.cpp', 'levelmanager.cpp',
'lights.cpp', 'lights.cpp',
@ -115,15 +124,6 @@ sources = [
'systems.cpp', 'systems.cpp',
'textures.cpp', 'textures.cpp',
'tilemap.cpp', 'tilemap.cpp',
'gui/boss_fight_ui.cpp',
'gui/loot_ui.cpp',
'gui/combat_ui.cpp',
'gui/debug_ui.cpp',
'gui/gui_fsm.cpp',
'gui/main_ui.cpp',
'gui/overlay_ui.cpp',
'gui/ritual_ui.cpp',
'gui/status_ui.cpp',
'worldbuilder.cpp', 'worldbuilder.cpp',
] ]

Loading…
Cancel
Save