🚚 Restructure files

CMakeLists.txt

@@ -211,16 +211,7 @@ add_library(PKWare STATIC
   3rdParty/PKWare/explode.cpp
   3rdParty/PKWare/implode.cpp)
 
-set(SourceS_SRCS
-  SourceS/console.cpp
-  SourceS/paths.cpp
-)
-if(USE_SDL1)
-  list(APPEND SourceS_SRCS SourceS/sdl2_to_1_2_backports.cpp)
-endif()
-add_library(SourceS STATIC ${SourceS_SRCS})
-
-add_library(devilution STATIC
+set(devilutionx_SRCS
   Source/appfat.cpp
   Source/automap.cpp
   Source/capture.cpp
@@ -235,8 +226,8 @@ add_library(devilution STATIC
   Source/drlg_l2.cpp
   Source/drlg_l3.cpp
   Source/drlg_l4.cpp
-  Source/dx.cpp
   Source/dthread.cpp
+  Source/dx.cpp
   Source/effects.cpp
   Source/encrypt.cpp
   Source/engine.cpp
@@ -252,6 +243,7 @@ add_library(devilution STATIC
   Source/items.cpp
   Source/lighting.cpp
   Source/loadsave.cpp
+  Source/main.cpp
   Source/mainmenu.cpp
   Source/minitext.cpp
   Source/misdat.cpp
@@ -272,6 +264,7 @@ add_library(devilution STATIC
   Source/player.cpp
   Source/plrmsg.cpp
   Source/portal.cpp
+  Source/qol.cpp
   Source/quests.cpp
   Source/render.cpp
   Source/restrict.cpp
@@ -289,96 +282,98 @@ add_library(devilution STATIC
   Source/town.cpp
   Source/towners.cpp
   Source/track.cpp
-  Source/trigs.cpp)
-
-set(devilutionx_SRCS
-  SourceX/qol.cpp
-  SourceX/controls/devices/game_controller.cpp
-  SourceX/controls/devices/joystick.cpp
-  SourceX/controls/devices/kbcontroller.cpp
-  SourceX/controls/axis_direction.cpp
-  SourceX/controls/controller.cpp
-  SourceX/controls/controller_motion.cpp
-  SourceX/controls/game_controls.cpp
-  SourceX/controls/menu_controls.cpp
-  SourceX/controls/modifier_hints.cpp
-  SourceX/controls/plrctrls.cpp
-  SourceX/controls/touch.cpp
-  SourceX/display.cpp
-  SourceX/miniwin/misc_msg.cpp
-  SourceX/thread.cpp
-  SourceX/soundsample.cpp
-  SourceX/storm_sdl_rw.cpp
-  SourceX/storm/storm.cpp
-  SourceX/storm/storm_net.cpp
-  SourceX/dvlnet/abstract_net.cpp
-  SourceX/dvlnet/loopback.cpp
-  SourceX/dvlnet/packet.cpp
-  SourceX/dvlnet/base.cpp
-  SourceX/dvlnet/frame_queue.cpp
-  SourceX/dvlnet/cdwrap.cpp
-  SourceX/DiabloUI/art_draw.cpp
-  SourceX/DiabloUI/errorart.cpp
-  SourceX/DiabloUI/art.cpp
-  SourceX/DiabloUI/button.cpp
-  SourceX/DiabloUI/credits.cpp
-  SourceX/DiabloUI/credits_lines.cpp
-  SourceX/DiabloUI/support_lines.cpp
-  SourceX/DiabloUI/diabloui.cpp
-  SourceX/DiabloUI/dialogs.cpp
-  SourceX/DiabloUI/fonts.cpp
-  SourceX/DiabloUI/mainmenu.cpp
-  SourceX/DiabloUI/progress.cpp
-  SourceX/DiabloUI/scrollbar.cpp
-  SourceX/DiabloUI/selconn.cpp
-  SourceX/DiabloUI/selgame.cpp
-  SourceX/DiabloUI/selhero.cpp
-  SourceX/DiabloUI/selyesno.cpp
-  SourceX/DiabloUI/selok.cpp
-  SourceX/DiabloUI/text_draw.cpp
-  SourceX/DiabloUI/text.cpp
-  SourceX/DiabloUI/title.cpp
-  SourceX/DiabloUI/ttf_render_wrapped.cpp
-  SourceX/main.cpp
-  SourceX/devilutionx.exe.manifest
+  Source/trigs.cpp
+  Source/controls/axis_direction.cpp
+  Source/controls/controller.cpp
+  Source/controls/controller_motion.cpp
+  Source/controls/devices/game_controller.cpp
+  Source/controls/devices/joystick.cpp
+  Source/controls/devices/kbcontroller.cpp
+  Source/controls/game_controls.cpp
+  Source/controls/menu_controls.cpp
+  Source/controls/modifier_hints.cpp
+  Source/controls/plrctrls.cpp
+  Source/controls/touch.cpp
+  Source/utils/console.cpp
+  Source/utils/display.cpp
+  Source/utils/paths.cpp
+  Source/utils/soundsample.cpp
+  Source/utils/thread.cpp
+  Source/DiabloUI/art.cpp
+  Source/DiabloUI/art_draw.cpp
+  Source/DiabloUI/button.cpp
+  Source/DiabloUI/credits.cpp
+  Source/DiabloUI/credits_lines.cpp
+  Source/DiabloUI/diabloui.cpp
+  Source/DiabloUI/dialogs.cpp
+  Source/DiabloUI/errorart.cpp
+  Source/DiabloUI/fonts.cpp
+  Source/DiabloUI/mainmenu.cpp
+  Source/DiabloUI/progress.cpp
+  Source/DiabloUI/scrollbar.cpp
+  Source/DiabloUI/selconn.cpp
+  Source/DiabloUI/selgame.cpp
+  Source/DiabloUI/selhero.cpp
+  Source/DiabloUI/selok.cpp
+  Source/DiabloUI/selyesno.cpp
+  Source/DiabloUI/support_lines.cpp
+  Source/DiabloUI/text.cpp
+  Source/DiabloUI/text_draw.cpp
+  Source/DiabloUI/title.cpp
+  Source/DiabloUI/ttf_render_wrapped.cpp
+  Source/dvlnet/abstract_net.cpp
+  Source/dvlnet/base.cpp
+  Source/dvlnet/cdwrap.cpp
+  Source/dvlnet/frame_queue.cpp
+  Source/dvlnet/loopback.cpp
+  Source/dvlnet/packet.cpp
+  Source/storm/storm.cpp
+  Source/storm/storm_net.cpp
+  Source/storm/storm_sdl_rw.cpp
+  Source/miniwin/misc_msg.cpp
+  Source/devilutionx.exe.manifest
   Packaging/macOS/AppIcon.icns
   Packaging/resources/CharisSILB.ttf
   Packaging/windows/devilutionx.rc)
 
+if(USE_SDL1)
+  list(APPEND devilutionx_SRCS Source/utils/sdl2_to_1_2_backports.cpp)
+endif()
+
 if(NOT NONET)
   list(APPEND devilutionx_SRCS
-    SourceX/dvlnet/tcp_client.cpp
-    SourceX/dvlnet/tcp_server.cpp
-    SourceX/dvlnet/protocol_zt.cpp
-    SourceX/dvlnet/base_protocol.cpp
-    SourceX/dvlnet/zerotier_native.cpp
-    SourceX/dvlnet/zerotier_lwip.cpp)
+    Source/dvlnet/tcp_client.cpp
+    Source/dvlnet/tcp_server.cpp
+    Source/dvlnet/protocol_zt.cpp
+    Source/dvlnet/base_protocol.cpp
+    Source/dvlnet/zerotier_native.cpp
+    Source/dvlnet/zerotier_lwip.cpp)
 endif()
 
 set(BIN_TARGET devilutionx)
 
 if(SWITCH)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/switch/network.cpp
-    SourceX/platform/switch/keyboard.cpp
-    SourceX/platform/switch/docking.cpp)
+    Source/platform/switch/network.cpp
+    Source/platform/switch/keyboard.cpp
+    Source/platform/switch/docking.cpp)
   set(BIN_TARGET devilutionx.elf)
 endif()
 
 if(VITA)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/vita/keyboard.cpp)
+    Source/platform/vita/keyboard.cpp)
 endif()
 
 if(VITA)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/vita/keyboard.cpp)
+    Source/platform/vita/keyboard.cpp)
 endif()
 
 if(N3DS)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/ctr/system.cpp
-    SourceX/platform/ctr/keyboard.cpp)
+    Source/platform/ctr/system.cpp
+    Source/platform/ctr/keyboard.cpp)
   set(BIN_TARGET ${BIN_TARGET}.elf)
 endif()
 
@@ -419,7 +414,6 @@ file(COPY "Packaging/resources/devilutionx.mpq" DESTINATION "${CMAKE_CURRENT_BIN
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(is_multi_config)
   set(CONFIG_PATH $<CONFIG>/config.h)
-  target_include_directories(devilution PRIVATE ${CMAKE_BINARY_DIR}/$<CONFIG>)
   target_include_directories(${BIN_TARGET} PRIVATE ${CMAKE_BINARY_DIR}/$<CONFIG>)
 else()
   set(CONFIG_PATH config.h)
@@ -447,26 +441,20 @@ if(GPERF)
   find_package(Gperftools REQUIRED)
 endif()
 
-target_include_directories(devilution PUBLIC 3rdParty/PKWare Source SourceS SourceX ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(${BIN_TARGET} PRIVATE
-  SourceS
-  SourceX
+  Source
+  3rdParty/PKWare
   3rdParty/asio/include
   3rdParty/Radon/Radon/include
-  3rdParty/libsmacker)
+  3rdParty/libsmacker
+  ${CMAKE_CURRENT_BINARY_DIR})
 
-if(N3DS)
-  target_link_libraries(devilution PUBLIC
-  SourceS)
-else()
-  target_link_libraries(devilution PUBLIC
-  Threads::Threads
-  SourceS)
+if(NOT N3DS)
+  target_link_libraries(${BIN_TARGET} PUBLIC
+  Threads::Threads)
 endif()
 
 target_link_libraries(${BIN_TARGET} PRIVATE
-  devilution
-  SourceS
   PKWare
   StormLib
   smacker
@@ -477,7 +465,7 @@ if(NOT NONET)
 endif()
 
 genex_for_option(DEBUG)
-target_compile_definitions(devilution PUBLIC "$<${DEBUG_GENEX}:_DEBUG>")
+target_compile_definitions(${BIN_TARGET} PUBLIC "$<${DEBUG_GENEX}:_DEBUG>")
 target_compile_definitions(${BIN_TARGET} PRIVATE ASIO_STANDALONE)
 
 # Defines without value
@@ -556,81 +544,79 @@ endforeach(def_name)
 
 genex_for_option(ASAN)
 genex_for_option(UBSAN)
-foreach(target devilution ${BIN_TARGET} SourceS)
-  target_compile_options(${target} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
-  target_link_libraries(${target} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
-  target_compile_options(${target} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
-  target_link_libraries(${target} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
-
-  if(USE_SDL1)
-    target_link_libraries(${target} PRIVATE
-      ${SDL_TTF_LIBRARY}
-      ${SDL_MIXER_LIBRARY}
-      ${SDL_LIBRARY})
-    target_compile_definitions(${target} PRIVATE USE_SDL1)
-  else()
-    target_link_libraries(${target} PRIVATE
-      SDL2::SDL2
-      SDL2::SDL2main
-      SDL2::SDL2_ttf
-      SDL2::SDL2_mixer)
-  endif()
+target_compile_options(${BIN_TARGET} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
+target_link_libraries(${BIN_TARGET} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
+target_compile_options(${BIN_TARGET} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
+target_link_libraries(${BIN_TARGET} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
 
-  if(SWITCH)
-    target_link_libraries(${target} PRIVATE switch::libnx
-      -lfreetype -lvorbisfile -lvorbis -logg -lmodplug -lmpg123 -lSDL2 -lopusfile -lopus -lEGL -lglapi -ldrm_nouveau -lpng -lbz2 -lz -lnx)
-  endif()
+if(USE_SDL1)
+  target_link_libraries(${BIN_TARGET} PRIVATE
+    ${SDL_TTF_LIBRARY}
+    ${SDL_MIXER_LIBRARY}
+    ${SDL_LIBRARY})
+  target_compile_definitions(${BIN_TARGET} PRIVATE USE_SDL1)
+else()
+  target_link_libraries(${BIN_TARGET} PRIVATE
+    SDL2::SDL2
+    SDL2::SDL2main
+    SDL2::SDL2_ttf
+    SDL2::SDL2_mixer)
+endif()
 
-  if(AMIGA)
-    target_link_libraries(${target} PRIVATE
-      ${FREETYPE_LIBRARY}
-      ${ZLIB_LIBRARY})
-    if(NOT WARPOS)
-      target_link_libraries(${target} PRIVATE -ldebug)
-    endif()
-  endif()
+if(SWITCH)
+  target_link_libraries(${BIN_TARGET} PRIVATE switch::libnx
+    -lfreetype -lvorbisfile -lvorbis -logg -lmodplug -lmpg123 -lSDL2 -lopusfile -lopus -lEGL -lglapi -ldrm_nouveau -lpng -lbz2 -lz -lnx)
+endif()
 
-  if (VITA)
-    target_link_libraries(${target} PRIVATE
-          SceAppMgr_stub
-          SceAudio_stub
-          SceCommonDialog_stub
-          SceCtrl_stub
-          SceDisplay_stub
-          SceGxm_stub
-          SceHid_stub
-          SceIofilemgr_stub
-          SceMotion_stub
-          ScePower_stub
-          SceSysmodule_stub
-          SceTouch_stub
-          freetype
-          png
-          m
-          z
-          FLAC
-          vorbisfile
-          vorbis
-          ogg
-          mikmod
-          mpg123
-    )
-    target_compile_definitions(${target} PRIVATE VITA)
+if(AMIGA)
+  target_link_libraries(${BIN_TARGET} PRIVATE
+    ${FREETYPE_LIBRARY}
+    ${ZLIB_LIBRARY})
+  if(NOT WARPOS)
+    target_link_libraries(${BIN_TARGET} PRIVATE -ldebug)
   endif()
+endif()
 
-  if(N3DS)
-    target_link_libraries(${target} PRIVATE ${TREMOR_LIBRARIES})
-    target_include_directories(${target} PRIVATE ${TREMOR_INCLUDE_DIRS})
-    target_link_libraries(${target} PRIVATE 3ds::ogg 3ds::mikmod 3ds::mad 3ds::freetype 3ds::bzip2 3ds::png)
-    target_link_libraries(${target} PRIVATE 3ds::citro3d 3ds::ctrulib)
-  endif()
+if (VITA)
+  target_link_libraries(${BIN_TARGET} PRIVATE
+        SceAppMgr_stub
+        SceAudio_stub
+        SceCommonDialog_stub
+        SceCtrl_stub
+        SceDisplay_stub
+        SceGxm_stub
+        SceHid_stub
+        SceIofilemgr_stub
+        SceMotion_stub
+        ScePower_stub
+        SceSysmodule_stub
+        SceTouch_stub
+        freetype
+        png
+        m
+        z
+        FLAC
+        vorbisfile
+        vorbis
+        ogg
+        mikmod
+        mpg123
+  )
+  target_compile_definitions(${BIN_TARGET} PRIVATE VITA)
+endif()
+
+if(N3DS)
+  target_link_libraries(${BIN_TARGET} PRIVATE ${TREMOR_LIBRARIES})
+  target_include_directories(${BIN_TARGET} PRIVATE ${TREMOR_INCLUDE_DIRS})
+  target_link_libraries(${BIN_TARGET} PRIVATE 3ds::ogg 3ds::mikmod 3ds::mad 3ds::freetype 3ds::bzip2 3ds::png)
+  target_link_libraries(${BIN_TARGET} PRIVATE 3ds::citro3d 3ds::ctrulib)
+endif()
 
-  target_compile_definitions(${target} PRIVATE ${def_list})
+target_compile_definitions(${BIN_TARGET} PRIVATE ${def_list})
 
-  if (GPERF)
-    target_link_libraries(${target} PRIVATE ${GPERFTOOLS_LIBRARIES})
-  endif()
-endforeach(target)
+if (GPERF)
+  target_link_libraries(${BIN_TARGET} PRIVATE ${GPERFTOOLS_LIBRARIES})
+endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT HAIKU AND NOT VITA)
   target_link_libraries(${BIN_TARGET} PUBLIC "$<$<NOT:$<CONFIG:Debug>>:-static-libgcc;-static-libstdc++>")
@@ -640,7 +626,7 @@ if(WIN32)
   target_link_libraries(${BIN_TARGET} PRIVATE wsock32 ws2_32 wininet)
 
   if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    target_compile_options(devilution PUBLIC $<$<CONFIG:Debug>:-gstabs>)
+    target_compile_options(${BIN_TARGET} PUBLIC $<$<CONFIG:Debug>:-gstabs>)
   endif()
 endif()
 
@@ -655,8 +641,8 @@ endif()
 
 if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # Change __FILE__ to only show the path relative to the project folder
-  get_target_property(devilution_SRCS devilution SOURCES)
-  foreach(SOURCE_FILE ${devilution_SRCS} ${devilutionx_SRCS})
+  get_target_property(devilutionx_SRCS ${BIN_TARGET} SOURCES)
+  foreach(SOURCE_FILE ${devilutionx_SRCS})
     set_source_files_properties(${SOURCE_FILE} PROPERTIES
       COMPILE_DEFINITIONS __FILE__="${SOURCE_FILE}"
     )
@@ -666,18 +652,17 @@ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 
   # Note: For Valgrind support.
   genex_for_option(DEBUG)
-  target_compile_options(devilution PUBLIC $<${DEBUG_GENEX}:-fno-omit-frame-pointer>)
+  target_compile_options(${BIN_TARGET} PUBLIC $<${DEBUG_GENEX}:-fno-omit-frame-pointer>)
 
   # Warnings for devilutionX
   target_compile_options(${BIN_TARGET} PRIVATE -Wall -Wextra -Wno-unused-parameter)
 
   # For ARM and other default unsigned char platforms
-  target_compile_options(devilution PRIVATE -fsigned-char)
   target_compile_options(${BIN_TARGET} PRIVATE -fsigned-char)
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-  target_compile_options(devilution PRIVATE "/W0")
+  target_compile_options(${BIN_TARGET} PRIVATE "/W0")
 endif()
 
 if(APPLE)

Source/DiabloUI/art.cpp

@@ -1,7 +1,7 @@
 #include "DiabloUI/art.h"
-#include "display.h"
 #include "storm/storm.h"
-#include "sdl_compat.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 

Source/DiabloUI/art.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "sdl_ptrs.h"
 #include "storm/storm.h"
+#include "utils/sdl_ptrs.h"
 
 namespace devilution {
 

Source/DiabloUI/art_draw.cpp

@@ -1,9 +1,9 @@
 #include "DiabloUI/art_draw.h"
 
 #include "DiabloUI/diabloui.h"
-#include "display.h"
 #include "render.h"
-#include "sdl_compat.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 

Source/DiabloUI/button.cpp

@@ -1,8 +1,8 @@
-#include "DiabloUI/button.h"
 #include "DiabloUI/art_draw.h"
-#include "DiabloUI/text_draw.h"
+#include "DiabloUI/button.h"
 #include "DiabloUI/errorart.h"
-#include "display.h"
+#include "DiabloUI/text_draw.h"
+#include "utils/display.h"
 
 namespace devilution {
 

Source/DiabloUI/credits.cpp

@@ -10,9 +10,9 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
 #include "DiabloUI/support_lines.h"
-#include "display.h"
-#include "sdl_compat.h"
-#include "sdl_ptrs.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
+#include "utils/sdl_ptrs.h"
 
 namespace devilution {
 

Source/DiabloUI/diabloui.cpp

@@ -11,14 +11,14 @@
 #include "DiabloUI/fonts.h"
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/text_draw.h"
-#include "display.h"
 #include "dx.h"
 #include "palette.h"
-#include "sdl_compat.h"
-#include "sdl_ptrs.h"
 #include "storm/storm.h"
-#include "stubs.h"
-#include "utf8.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
+#include "utils/sdl_ptrs.h"
+#include "utils/stubs.h"
+#include "utils/utf8.h"
 
 #ifdef __SWITCH__
 // for virtual keyboard on Switch

Source/DiabloUI/diabloui.h

@@ -7,8 +7,8 @@
 
 #include "DiabloUI/art.h"
 #include "DiabloUI/ui_item.h"
-#include "display.h"
 #include "player.h"
+#include "utils/display.h"
 
 namespace devilution {
 

Source/DiabloUI/dialogs.cpp

@@ -6,9 +6,9 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/errorart.h"
 #include "DiabloUI/fonts.h"
-#include "display.h"
 #include "dx.h"
 #include "palette.h"
+#include "utils/display.h"
 
 namespace devilution {
 

Source/DiabloUI/fonts.cpp

@@ -1,8 +1,8 @@
 #include "DiabloUI/fonts.h"
 
 #include "diablo.h"
-#include "file_util.h"
-#include "paths.h"
+#include "utils/file_util.h"
+#include "utils/paths.h"
 
 namespace devilution {
 

Source/DiabloUI/progress.cpp

@@ -4,9 +4,9 @@
 #include "DiabloUI/button.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
-#include "display.h"
 #include "dx.h"
 #include "palette.h"
+#include "utils/display.h"
 
 namespace devilution {
 

Source/DiabloUI/text_draw.cpp

@@ -4,9 +4,9 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
 #include "DiabloUI/text.h"
-#include "DiabloUI/ui_item.h"
 #include "DiabloUI/ttf_render_wrapped.h"
-#include "display.h"
+#include "DiabloUI/ui_item.h"
+#include "utils/display.h"
 
 namespace devilution {
 

Source/DiabloUI/text_draw.h

@@ -2,7 +2,7 @@
 
 #include <SDL.h>
 
-#include "sdl_ptrs.h"
+#include "utils/sdl_ptrs.h"
 
 namespace devilution {
 

Source/DiabloUI/ttf_render_wrapped.cpp

@@ -5,12 +5,12 @@
 
 #include <SDL.h>
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
-#include "sdl_compat.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 

Source/DiabloUI/ui_item.h

@@ -5,10 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "stubs.h"
-
 #include "DiabloUI/art.h"
 #include "DiabloUI/text_draw.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 

Source/appfat.cpp

@@ -8,7 +8,7 @@
 
 #include "diablo.h"
 #include "storm/storm.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 

Source/appfat.h

@@ -7,7 +7,7 @@
 
 #include <SDL.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/automap.cpp

@@ -5,13 +5,13 @@
  */
 #include "automap.h"
 #include "control.h"
-#include "player.h"
-#include "palette.h"
 #include "inv.h"
+#include "miniwin/miniwin.h"
 #include "monster.h"
+#include "palette.h"
+#include "player.h"
 #include "setmaps.h"
-#include "miniwin.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 

Source/capture.cpp

@@ -7,12 +7,12 @@
 
 #include "DiabloUI/diabloui.h"
 #include "dx.h"
-#include "file_util.h"
 #include "palette.h"
-#include "paths.h"
 #include "render.h"
 #include "storm/storm.h"
-#include "ui_fwd.h"
+#include "utils/file_util.h"
+#include "utils/paths.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 

Source/codec.cpp

@@ -8,7 +8,7 @@
 #include <cstdint>
 
 #include "appfat.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 #include "sha.h"
 
 namespace devilution {

Source/codec.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/control.h

@@ -10,7 +10,7 @@
 #include "engine.h"
 #include "spelldat.h"
 #include "spells.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 

Source/controls/devices/game_controller.cpp

@@ -6,8 +6,8 @@
 
 #include "controls/controller_motion.h"
 #include "controls/devices/joystick.h"
-#include "sdl_ptrs.h"
-#include "stubs.h"
+#include "utils/sdl_ptrs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 

Source/controls/devices/joystick.cpp

@@ -3,7 +3,7 @@
 #include <cstddef>
 
 #include "controls/controller_motion.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 

Source/controls/devices/joystick.h

@@ -6,11 +6,11 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
-#include "controls/controller.h"
 #include "controls/controller_buttons.h"
+#include "controls/controller.h"
 
 namespace devilution {
 

Source/controls/devices/kbcontroller.cpp

@@ -3,8 +3,8 @@
 #if HAS_KBCTRL == 1
 
 #include "controls/controller_motion.h"
-#include "sdl_compat.h"
-#include "stubs.h"
+#include "utils/sdl_compat.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 

Source/controls/menu_controls.cpp

@@ -5,7 +5,7 @@
 #include "controls/controller_motion.h"
 #include "controls/remap_keyboard.h"
 #include "DiabloUI/diabloui.h"
-#include "sdl_compat.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 

Source/controls/remap_keyboard.h

@@ -5,7 +5,7 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 namespace devilution {

Source/controls/touch.cpp

@@ -1,9 +1,10 @@
 #ifndef USE_SDL1
-#include "display.h"
+#include <math.h>
+
 #include "options.h"
 #include "touch.h"
-#include "ui_fwd.h"
-#include <math.h>
+#include "utils/display.h"
+#include "utils/ui_fwd.h"
 
 static int visible_width;
 static int visible_height;

Source/cursor.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/debug.h

@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/diablo.cpp

@@ -7,7 +7,6 @@
 
 #include "automap.h"
 #include "capture.h"
-#include "console.h"
 #include "control.h"
 #include "cursor.h"
 #include "dead.h"
@@ -36,13 +35,12 @@
 #include "multi.h"
 #include "nthread.h"
 #include "options.h"
-#include "paths.h"
 #include "pfile.h"
 #include "plrmsg.h"
+#include "qol.h"
 #include "restrict.h"
 #include "setmaps.h"
 #include "sound.h"
-#include "qol.h"
 #include "stores.h"
 #include "storm/storm.h"
 #include "themes.h"
@@ -50,6 +48,8 @@
 #include "town.h"
 #include "track.h"
 #include "trigs.h"
+#include "utils/console.h"
+#include "utils/paths.h"
 
 namespace devilution {
 

Source/drlg_l1.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/drlg_l2.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/drlg_l3.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/drlg_l4.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 

Source/dthread.cpp

@@ -6,7 +6,7 @@
 
 #include "nthread.h"
 #include "storm/storm.h"
-#include "thread.h"
+#include "utils/thread.h"
 
 namespace devilution {
 

Source/dvlnet/abstract_net.cpp

@@ -1,6 +1,6 @@
 #include "dvlnet/abstract_net.h"
 
-#include "stubs.h"
+#include "utils/stubs.h"
 #ifndef NONET
 #include "dvlnet/cdwrap.h"
 #include "dvlnet/tcp_client.h"

Source/dvlnet/base_protocol.cpp

@@ -4,7 +4,7 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 namespace devilution {

Source/dvlnet/loopback.cpp

@@ -1,5 +1,5 @@
 #include "dvlnet/loopback.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 namespace net {

Source/dvlnet/packet.h

@@ -10,7 +10,7 @@
 #endif
 
 #include "dvlnet/abstract_net.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 namespace net {

Source/dvlnet/protocol_zt.cpp

@@ -5,9 +5,9 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
 #include <lwip/sockets.h>