Move path and palette to the engine folder

Source/CMakeLists.txt

@@ -42,8 +42,6 @@ set(libdevilutionx_SRCS
   objects.cpp
   options.cpp
   pack.cpp
-  palette.cpp
-  path.cpp
   pfile.cpp
   player.cpp
   plrmsg.cpp
@@ -59,6 +57,7 @@ set(libdevilutionx_SRCS
   tmsg.cpp
   towners.cpp
   track.cpp
+
   controls/axis_direction.cpp
   controls/controller.cpp
   controls/controller_motion.cpp
@@ -68,6 +67,7 @@ set(libdevilutionx_SRCS
   controls/menu_controls.cpp
   controls/modifier_hints.cpp
   controls/plrctrls.cpp
+
   DiabloUI/art.cpp
   DiabloUI/art_draw.cpp
   DiabloUI/button.cpp
@@ -87,23 +87,28 @@ set(libdevilutionx_SRCS
   DiabloUI/settingsmenu.cpp
   DiabloUI/support_lines.cpp
   DiabloUI/title.cpp
+
   dvlnet/abstract_net.cpp
   dvlnet/base.cpp
   dvlnet/cdwrap.cpp
   dvlnet/frame_queue.cpp
   dvlnet/loopback.cpp
   dvlnet/packet.cpp
+
   engine/animationinfo.cpp
   engine/assets.cpp
   engine/demomode.cpp
   engine/direction.cpp
   engine/dx.cpp
   engine/load_cel.cpp
-  engine/load_pcx.cpp
   engine/load_pcx_as_cel.cpp
+  engine/load_pcx.cpp
+  engine/palette.cpp
+  engine/path.cpp
   engine/random.cpp
   engine/surface.cpp
   engine/trn.cpp
+
   engine/render/automap_render.cpp
   engine/render/cel_render.cpp
   engine/render/cl2_render.cpp
@@ -111,6 +116,7 @@ set(libdevilutionx_SRCS
   engine/render/pcx_render.cpp
   engine/render/scrollrt.cpp
   engine/render/text_render.cpp
+
   levels/drlg_l1.cpp
   levels/drlg_l2.cpp
   levels/drlg_l3.cpp
@@ -120,25 +126,32 @@ set(libdevilutionx_SRCS
   levels/themes.cpp
   levels/town.cpp
   levels/trigs.cpp
+
   miniwin/misc_msg.cpp
+
   mpq/mpq_reader.cpp
   mpq/mpq_sdl_rwops.cpp
   mpq/mpq_writer.cpp
+
   panels/charpanel.cpp
   panels/info_box.cpp
   panels/mainpanel.cpp
   panels/spell_book.cpp
   panels/spell_icons.cpp
   panels/spell_list.cpp
+
   platform/locale.cpp
+
   qol/autopickup.cpp
   qol/chatlog.cpp
   qol/itemlabels.cpp
   qol/monhealthbar.cpp
   qol/stash.cpp
   qol/xpbar.cpp
+
   storm/storm_net.cpp
   storm/storm_svid.cpp
+
   utils/console.cpp
   utils/display.cpp
   utils/file_util.cpp

Source/DiabloUI/art_draw.cpp

@@ -1,7 +1,7 @@
 #include "DiabloUI/art_draw.h"
 
 #include "DiabloUI/diabloui.h"
-#include "palette.h"
+#include "engine/palette.h"
 #include "utils/display.h"
 #include "utils/sdl_compat.h"
 

Source/DiabloUI/diabloui.cpp

@@ -16,11 +16,11 @@
 #include "engine/dx.h"
 #include "engine/load_pcx.hpp"
 #include "engine/load_pcx_as_cel.hpp"
+#include "engine/palette.h"
 #include "engine/pcx_sprite.hpp"
 #include "engine/render/cel_render.hpp"
 #include "engine/render/pcx_render.hpp"
 #include "hwcursor.hpp"
-#include "palette.h"
 #include "utils/display.h"
 #include "utils/language.h"
 #include "utils/log.hpp"

Source/DiabloUI/dialogs.cpp

@@ -9,9 +9,9 @@
 #include "controls/menu_controls.h"
 #include "engine/dx.h"
 #include "engine/load_pcx.hpp"
+#include "engine/palette.h"
 #include "engine/pcx_sprite.hpp"
 #include "hwcursor.hpp"
-#include "palette.h"
 #include "utils/display.h"
 #include "utils/language.h"
 #include "utils/log.hpp"

Source/DiabloUI/progress.cpp

@@ -8,10 +8,10 @@
 #include "controls/menu_controls.h"
 #include "engine/dx.h"
 #include "engine/load_pcx.hpp"
+#include "engine/palette.h"
 #include "engine/pcx_sprite.hpp"
 #include "engine/render/pcx_render.hpp"
 #include "hwcursor.hpp"
-#include "palette.h"
 #include "utils/display.h"
 #include "utils/language.h"
 

Source/automap.cpp

@@ -9,10 +9,10 @@
 
 #include "control.h"
 #include "engine/load_file.hpp"
+#include "engine/palette.h"
 #include "engine/render/automap_render.hpp"
 #include "levels/gendung.h"
 #include "levels/setmaps.h"
-#include "palette.h"
 #include "player.h"
 #include "utils/language.h"
 #include "utils/stdcompat/algorithm.hpp"

Source/capture.cpp

@@ -9,7 +9,7 @@
 
 #include "DiabloUI/diabloui.h"
 #include "engine/dx.h"
-#include "palette.h"
+#include "engine/palette.h"
 #include "utils/file_util.h"
 #include "utils/log.hpp"
 #include "utils/paths.h"

Source/engine/path.cpp

@@ -3,7 +3,7 @@
  *
  * Implementation of the path finding algorithms.
  */
-#include "path.h"
+#include "engine/path.h"
 
 #include <array>
 

Source/engine/render/cel_render.cpp

@@ -9,11 +9,11 @@
 #include <cstring>
 
 #include "engine/cel_header.hpp"
+#include "engine/palette.h"
 #include "engine/render/common_impl.h"
 #include "engine/render/scrollrt.h"
 #include "engine/trn.hpp"
 #include "options.h"
-#include "palette.h"
 #include "utils/attributes.h"
 
 namespace devilution {

Source/engine/render/text_render.cpp

@@ -18,8 +18,8 @@
 #include "engine/load_cel.hpp"
 #include "engine/load_file.hpp"
 #include "engine/load_pcx.hpp"
+#include "engine/palette.h"
 #include "engine/point.hpp"
-#include "palette.h"
 #include "pcx_render.hpp"
 #include "utils/display.h"
 #include "utils/language.h"

Source/interfac.cpp

@@ -14,13 +14,13 @@
 #include "engine/dx.h"
 #include "engine/load_cel.hpp"
 #include "engine/load_pcx.hpp"
+#include "engine/palette.h"
 #include "engine/pcx_sprite.hpp"
 #include "engine/render/cel_render.hpp"
 #include "engine/render/pcx_render.hpp"
 #include "hwcursor.hpp"
 #include "init.h"
 #include "loadsave.h"
-#include "palette.h"
 #include "pfile.h"
 #include "plrmsg.h"
 #include "utils/sdl_geometry.h"

Source/inv.h

@@ -7,10 +7,10 @@
 
 #include <cstdint>
 
+#include "engine/palette.h"
 #include "engine/point.hpp"
 #include "inv_iterators.hpp"
 #include "items.h"
-#include "palette.h"
 #include "player.h"
 
 namespace devilution {

Source/levels/setmaps.cpp

@@ -4,6 +4,7 @@
 #include "debug.h"
 #endif
 #include "engine/load_file.hpp"
+#include "engine/palette.h"
 #include "levels/drlg_l1.h"
 #include "levels/drlg_l2.h"
 #include "levels/drlg_l3.h"
@@ -12,7 +13,6 @@
 #include "levels/trigs.h"
 #include "objdat.h"
 #include "objects.h"
-#include "palette.h"
 #include "quests.h"
 #include "utils/language.h"
 

Source/levels/themes.cpp

@@ -5,13 +5,13 @@
  */
 #include "levels/themes.h"
 
+#include "engine/path.h"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
 #include "items.h"
 #include "levels/trigs.h"
 #include "monster.h"
 #include "objects.h"
-#include "path.h"
 #include "quests.h"
 
 namespace devilution {

Source/panels/spell_icons.cpp

@@ -1,9 +1,9 @@
 #include "panels/spell_icons.hpp"
 
 #include "engine/load_cel.hpp"
+#include "engine/palette.h"
 #include "engine/render/cel_render.hpp"
 #include "init.h"
-#include "palette.h"
 #include "utils/stdcompat/optional.hpp"
 
 namespace devilution {

Source/panels/spell_list.cpp

@@ -4,10 +4,10 @@
 
 #include "control.h"
 #include "engine.h"
+#include "engine/palette.h"
 #include "engine/render/text_render.hpp"
 #include "inv_iterators.hpp"
 #include "options.h"
-#include "palette.h"
 #include "panels/spell_icons.hpp"
 #include "player.h"
 #include "spells.h"

Source/player.h

@@ -13,12 +13,12 @@
 #include "engine/actor_position.hpp"
 #include "engine/animationinfo.h"
 #include "engine/cel_sprite.hpp"
+#include "engine/path.h"
 #include "engine/point.hpp"
 #include "interfac.h"
 #include "items.h"
 #include "levels/gendung.h"
 #include "multi.h"
-#include "path.h"
 #include "spelldat.h"
 #include "utils/attributes.h"
 #include "utils/enum_traits.h"

Source/storm/storm_svid.cpp

@@ -12,8 +12,8 @@
 
 #include "engine/assets.hpp"
 #include "engine/dx.h"
+#include "engine/palette.h"
 #include "options.h"
-#include "palette.h"
 #include "utils/aulib.hpp"
 #include "utils/display.h"
 #include "utils/log.hpp"

test/path_test.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "path.h"
+#include "engine/path.h"
 
 // The following headers are included to access globals used in functions that have not been isolated yet.
 #include "levels/gendung.h"