diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index f462e3779..974ceb369 100644 --- a/Source/CMakeLists.txt +++ b/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 diff --git a/Source/DiabloUI/art_draw.cpp b/Source/DiabloUI/art_draw.cpp index a439eb89f..77d78fecb 100644 --- a/Source/DiabloUI/art_draw.cpp +++ b/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" diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp index d44212ab0..c78c9fce8 100644 --- a/Source/DiabloUI/diabloui.cpp +++ b/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" diff --git a/Source/DiabloUI/dialogs.cpp b/Source/DiabloUI/dialogs.cpp index 9e18b6fa9..a3703727c 100644 --- a/Source/DiabloUI/dialogs.cpp +++ b/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" diff --git a/Source/DiabloUI/progress.cpp b/Source/DiabloUI/progress.cpp index bc8f6e5e6..c41c81bfe 100644 --- a/Source/DiabloUI/progress.cpp +++ b/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" diff --git a/Source/automap.cpp b/Source/automap.cpp index 7346a5082..601f788f6 100644 --- a/Source/automap.cpp +++ b/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" diff --git a/Source/capture.cpp b/Source/capture.cpp index 8bfb9a402..aa4970e66 100644 --- a/Source/capture.cpp +++ b/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" diff --git a/Source/palette.cpp b/Source/engine/palette.cpp similarity index 100% rename from Source/palette.cpp rename to Source/engine/palette.cpp diff --git a/Source/palette.h b/Source/engine/palette.h similarity index 100% rename from Source/palette.h rename to Source/engine/palette.h diff --git a/Source/path.cpp b/Source/engine/path.cpp similarity index 96% rename from Source/path.cpp rename to Source/engine/path.cpp index ee3ecf7ec..3e31df181 100644 --- a/Source/path.cpp +++ b/Source/engine/path.cpp @@ -3,7 +3,7 @@ * * Implementation of the path finding algorithms. */ -#include "path.h" +#include "engine/path.h" #include diff --git a/Source/path.h b/Source/engine/path.h similarity index 100% rename from Source/path.h rename to Source/engine/path.h diff --git a/Source/engine/render/cel_render.cpp b/Source/engine/render/cel_render.cpp index 64516a7dc..af6ef0ddf 100644 --- a/Source/engine/render/cel_render.cpp +++ b/Source/engine/render/cel_render.cpp @@ -9,11 +9,11 @@ #include #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 { diff --git a/Source/engine/render/text_render.cpp b/Source/engine/render/text_render.cpp index 08c6e9348..ea6c94ef6 100644 --- a/Source/engine/render/text_render.cpp +++ b/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" diff --git a/Source/interfac.cpp b/Source/interfac.cpp index 720e7a00f..35979b9f9 100644 --- a/Source/interfac.cpp +++ b/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" diff --git a/Source/inv.h b/Source/inv.h index 7ebaa2d88..ec07dcf8b 100644 --- a/Source/inv.h +++ b/Source/inv.h @@ -7,10 +7,10 @@ #include +#include "engine/palette.h" #include "engine/point.hpp" #include "inv_iterators.hpp" #include "items.h" -#include "palette.h" #include "player.h" namespace devilution { diff --git a/Source/levels/setmaps.cpp b/Source/levels/setmaps.cpp index 9420c994f..a3d9a54b7 100644 --- a/Source/levels/setmaps.cpp +++ b/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" diff --git a/Source/levels/themes.cpp b/Source/levels/themes.cpp index 1846b88a9..72155e1a3 100644 --- a/Source/levels/themes.cpp +++ b/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 { diff --git a/Source/panels/spell_icons.cpp b/Source/panels/spell_icons.cpp index 785ee1e29..e79a85b02 100644 --- a/Source/panels/spell_icons.cpp +++ b/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 { diff --git a/Source/panels/spell_list.cpp b/Source/panels/spell_list.cpp index 286b286c0..850c2a853 100644 --- a/Source/panels/spell_list.cpp +++ b/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" diff --git a/Source/player.h b/Source/player.h index baec132fa..d07b918bc 100644 --- a/Source/player.h +++ b/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" diff --git a/Source/storm/storm_svid.cpp b/Source/storm/storm_svid.cpp index a8dfd2d0d..8c4132654 100644 --- a/Source/storm/storm_svid.cpp +++ b/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" diff --git a/test/path_test.cpp b/test/path_test.cpp index acac4df79..43eb37f7e 100644 --- a/test/path_test.cpp +++ b/test/path_test.cpp @@ -1,6 +1,6 @@ #include -#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"