Clang-tidy: llvm-include-order

Source/DiabloUI/credits.cpp

@@ -12,10 +12,10 @@
 #include "controls/menu_controls.h"
 #include "hwcursor.hpp"
 #include "utils/display.h"
+#include "utils/language.h"
+#include "utils/log.hpp"
 #include "utils/sdl_compat.h"
 #include "utils/sdl_ptrs.h"
-#include "utils/log.hpp"
-#include "utils/language.h"
 
 namespace devilution {
 

Source/DiabloUI/diabloui.cpp

@@ -16,11 +16,11 @@
 #include "palette.h"
 #include "storm/storm.h"
 #include "utils/display.h"
+#include "utils/log.hpp"
 #include "utils/sdl_compat.h"
 #include "utils/sdl_ptrs.h"
 #include "utils/stubs.h"
 #include "utils/utf8.h"
-#include "utils/log.hpp"
 
 #ifdef __SWITCH__
 // for virtual keyboard on Switch

Source/DiabloUI/dialogs.cpp

@@ -12,8 +12,8 @@
 #include "hwcursor.hpp"
 #include "palette.h"
 #include "utils/display.h"
-#include "utils/log.hpp"
 #include "utils/language.h"
+#include "utils/log.hpp"
 
 namespace devilution {
 

Source/DiabloUI/fonts.cpp

@@ -3,8 +3,8 @@
 #include "diablo.h"
 #include "engine/load_file.hpp"
 #include "utils/file_util.h"
-#include "utils/paths.h"
 #include "utils/log.hpp"
+#include "utils/paths.h"
 
 namespace devilution {
 

Source/DiabloUI/ttf_render_wrapped.cpp

@@ -10,8 +10,8 @@
 #include "utils/sdl2_backports.h"
 #endif
 
-#include "utils/sdl_compat.h"
 #include "utils/log.hpp"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 

Source/appfat.cpp

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

Source/capture.cpp

@@ -10,9 +10,9 @@
 #include "palette.h"
 #include "storm/storm.h"
 #include "utils/file_util.h"
+#include "utils/log.hpp"
 #include "utils/paths.h"
 #include "utils/ui_fwd.h"
-#include "utils/log.hpp"
 
 namespace devilution {
 

Source/controls/devices/game_controller.cpp

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

Source/controls/devices/joystick.cpp

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

Source/controls/plrctrls.cpp

@@ -6,8 +6,8 @@
 
 #include "automap.h"
 #include "control.h"
-#include "controls/controller_motion.h"
 #include "controls/controller.h"
+#include "controls/controller_motion.h"
 #include "controls/game_controls.h"
 #include "cursor.h"
 #include "doom.h"

Source/cursor.cpp

@@ -9,9 +9,9 @@
 
 #include "control.h"
 #include "doom.h"
+#include "engine.h"
 #include "engine/load_cel.hpp"
 #include "engine/point.hpp"
-#include "engine.h"
 #include "engine/render/cel_render.hpp"
 #include "hwcursor.hpp"
 #include "inv.h"

Source/diablo.cpp

@@ -18,6 +18,7 @@
 #include "debug.h"
 #endif
 #include "DiabloUI/diabloui.h"
+#include "controls/keymapper.hpp"
 #include "doom.h"
 #include "drlg_l1.h"
 #include "drlg_l2.h"
@@ -59,8 +60,6 @@
 #include "utils/console.h"
 #include "utils/language.h"
 #include "utils/paths.h"
-#include "utils/language.h"
-#include "controls/keymapper.hpp"
 
 #ifndef NOSOUND
 #include "sound.h"

Source/drlg_l1.cpp

@@ -5,8 +5,8 @@
  */
 #include "drlg_l1.h"
 
-#include "engine/point.hpp"
 #include "engine/load_file.hpp"
+#include "engine/point.hpp"
 #include "gendung.h"
 #include "lighting.h"
 #include "player.h"

Source/dvlnet/loopback.cpp

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

Source/dvlnet/zerotier_native.cpp

@@ -12,8 +12,8 @@
 #include <ZeroTierSockets.h>
 #include <cstdlib>
 
-#include "utils/paths.h"
 #include "utils/log.hpp"
+#include "utils/paths.h"
 
 #include "dvlnet/zerotier_lwip.h"
 

Source/encrypt.cpp

@@ -3,8 +3,8 @@
  *
  * Implementation of functions for compression and decompressing MPQ data.
  */
-#include <memory>
 #include <SDL.h>
+#include <memory>
 
 #include "encrypt.h"
 #include "pkware.h"

Source/items.cpp

@@ -6,9 +6,9 @@
 #include "items.h"
 
 #include <algorithm>
+#include <bitset>
 #include <climits>
 #include <cstdint>
-#include <bitset>
 
 #include <fmt/format.h>
 

Source/miniwin/misc_msg.cpp

@@ -3,8 +3,8 @@
 #include <deque>
 
 #include "control.h"
-#include "controls/controller_motion.h"
 #include "controls/controller.h"
+#include "controls/controller_motion.h"
 #include "controls/game_controls.h"
 #include "controls/plrctrls.h"
 #include "controls/remap_keyboard.h"

Source/movie.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "diablo.h"
-#include "hwcursor.hpp"
 #include "effects.h"
+#include "hwcursor.hpp"
 #include "storm/storm_svid.h"
 #include "utils/display.h"
 

Source/options.cpp

@@ -4,14 +4,14 @@
  * Load and save options from the diablo.ini file.
  */
 
-#include <fstream>
 #include <cstdint>
+#include <fstream>
 
 #define SI_SUPPORT_IOSTREAMS
 #include <SimpleIni.h>
 
-#include "options.h"
 #include "diablo.h"
+#include "options.h"
 #include "utils/file_util.h"
 #include "utils/paths.h"
 

Source/qol/itemlabels.cpp

@@ -1,8 +1,8 @@
 #include "itemlabels.h"
 
-#include <vector>
 #include <string>
 #include <unordered_set>
+#include <vector>
 
 #include "common.h"
 #include "control.h"

Source/sound.cpp

@@ -10,16 +10,16 @@
 #include <memory>
 #include <mutex>
 
-#include <aulib.h>
 #include <Aulib/DecoderDrwav.h>
-#include <Aulib/Stream.h>
 #include <Aulib/ResamplerSpeex.h>
+#include <Aulib/Stream.h>
 #include <SDL.h>
+#include <aulib.h>
 
 #include "init.h"
 #include "options.h"
-#include "storm/storm_sdl_rw.h"
 #include "storm/storm.h"
+#include "storm/storm_sdl_rw.h"
 #include "utils/log.hpp"
 #include "utils/math.h"
 #include "utils/sdl_mutex.h"

Source/storm/storm.cpp

@@ -5,9 +5,9 @@
 #include <mutex>
 #include <string>
 
-#include "storm/storm.h"
 #include "DiabloUI/diabloui.h"
 #include "options.h"
+#include "storm/storm.h"
 #include "utils/file_util.h"
 #include "utils/log.hpp"
 #include "utils/paths.h"

Source/storm/storm_net.cpp

@@ -1,9 +1,9 @@
 #include <memory>
 #ifndef NONET
+#include "utils/sdl_mutex.h"
 #include <mutex>
 #include <thread>
 #include <utility>
-#include "utils/sdl_mutex.h"
 #endif
 
 #include "dvlnet/abstract_net.h"

Source/storm/storm_svid.cpp

@@ -8,8 +8,8 @@
 #include <smacker.h>
 
 #ifndef NOSOUND
-#include <Aulib/Stream.h>
 #include <Aulib/ResamplerSpeex.h>
+#include <Aulib/Stream.h>
 
 #include "utils/push_aulib_decoder.h"
 #endif
@@ -17,8 +17,8 @@
 #include "dx.h"
 #include "options.h"
 #include "palette.h"
-#include "storm/storm_file_wrapper.h"
 #include "storm/storm.h"
+#include "storm/storm_file_wrapper.h"
 #include "utils/display.h"
 #include "utils/log.hpp"
 #include "utils/sdl_compat.h"

Source/utils/paths.cpp

@@ -2,9 +2,9 @@
 
 #include <SDL.h>
 
-#include "utils/stdcompat/optional.hpp"
 #include "utils/file_util.h"
 #include "utils/log.hpp"
+#include "utils/stdcompat/optional.hpp"
 
 #ifdef USE_SDL1
 #include "utils/sdl2_to_1_2_backports.h"

Source/utils/soundsample.cpp

@@ -1,7 +1,7 @@
 #include "utils/soundsample.h"
 
-#include <cmath>
 #include <chrono>
+#include <cmath>
 
 #include <Aulib/DecoderDrwav.h>
 #include <Aulib/ResamplerSpeex.h>
@@ -13,8 +13,8 @@
 #endif
 
 #include "options.h"
-#include "storm/storm_sdl_rw.h"
 #include "storm/storm.h"
+#include "storm/storm_sdl_rw.h"
 #include "utils/log.hpp"
 #include "utils/math.h"
 #include "utils/stubs.h"

Source/utils/thread.cpp

@@ -4,8 +4,8 @@
 #include <set>
 
 #include "appfat.h"
-#include "utils/stubs.h"
 #include "utils/log.hpp"
+#include "utils/stubs.h"
 
 namespace devilution {