🚚 Move header we implement into the project

CMakeLists.txt

@@ -447,7 +447,7 @@ if(GPERF)
   find_package(Gperftools REQUIRED)
 endif()
 
-target_include_directories(devilution PUBLIC Source SourceS ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(devilution PUBLIC Source SourceS SourceX ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(${BIN_TARGET} PRIVATE
   SourceS
   SourceX

DiabloUI/diabloui.h

@@ -1,72 +0,0 @@
-//HEADER_GOES_HERE
-#pragma once
-
-#include <stdint.h>
-
-namespace devilution {
-
-enum _mainmenu_selections : uint8_t {
-	MAINMENU_NONE,
-	MAINMENU_SINGLE_PLAYER,
-	MAINMENU_MULTIPLAYER,
-	MAINMENU_REPLAY_INTRO,
-	MAINMENU_SHOW_SUPPORT,
-	MAINMENU_SHOW_CREDITS,
-	MAINMENU_EXIT_DIABLO,
-	MAINMENU_ATTRACT_MODE,
-};
-
-enum _selhero_selections : uint8_t {
-	SELHERO_NEW_DUNGEON,
-	SELHERO_CONTINUE,
-	SELHERO_CONNECT,
-	SELHERO_PREVIOUS,
-};
-
-struct _uidefaultstats {
-	Uint16 strength;
-	Uint16 magic;
-	Uint16 dexterity;
-	Uint16 vitality;
-};
-
-struct _uiheroinfo {
-	struct _uiheroinfo *next;
-	char name[16];
-	Uint16 level;
-	HeroClass heroclass;
-	Uint8 herorank;
-	Uint16 strength;
-	Uint16 magic;
-	Uint16 dexterity;
-	Uint16 vitality;
-	Sint32 gold;
-	Sint32 hassaved;
-	bool spawned;
-};
-
-void UiDestroy();
-void UiTitleDialog();
-void UiSetSpawned(bool bSpawned);
-void UiInitialize();
-bool UiValidPlayerName(const char *name); /* check */
-void UiSelHeroMultDialog(bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)), bool (*fncreate)(_uiheroinfo *), bool (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16]);
-void UiSelHeroSingDialog(bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)), bool (*fncreate)(_uiheroinfo *), bool (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16], _difficulty *difficulty);
-bool UiCreditsDialog();
-bool UiSupportDialog();
-bool UiMainMenuDialog(const char *name, _mainmenu_selections *pdwResult, void (*fnSound)(const char *file), int attractTimeOut);
-bool UiProgressDialog(const char *msg, int (*fnfunc)(), int rate);
-void UiProfileCallback();
-void UiProfileDraw();
-bool UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7);
-bool UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5);
-bool UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, char *lpBuffer, int cchBufferMax);
-bool UiSoundCallback(int a1, int type, int a3);
-bool UiDrawDescCallback(int game_type, DWORD color, const char *lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
-bool UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6);
-bool UiArtCallback(int game_type, unsigned int art_code, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp);
-int UiSelectGame(GameData *gameData, int *playerId);
-int UiSelectProvider(GameData *gameData);
-void UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, Uint32 type);
-
-} // namespace devilution

Source/appfat.cpp

@@ -4,7 +4,7 @@
  * Implementation of error dialogs.
  */
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include <config.h>
 
 namespace devilution {

Source/appfat.h

@@ -7,6 +7,8 @@
 
 #include <SDL.h>
 
+#include "miniwin.h"
+
 namespace devilution {
 
 #define ErrSdl() ErrDlg("SDL Error", SDL_GetError(), __FILE__, __LINE__)

Source/capture.cpp

@@ -6,7 +6,7 @@
 #include <fstream>
 
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "paths.h"
 #include "file_util.h"
 

Source/diablo.cpp

@@ -9,8 +9,8 @@
 #include "options.h"
 #include "multi.h"
 #include "sound.h"
-#include "../3rdParty/Storm/Source/storm.h"
-#include "../DiabloUI/diabloui.h"
+#include "storm/storm.h"
+#include "DiabloUI/diabloui.h"
 #include <config.h>
 
 namespace devilution {

Source/dthread.cpp

@@ -4,7 +4,7 @@
  * Implementation of functions for updating game state from network commands.
  */
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

Source/dx.cpp

@@ -4,7 +4,7 @@
  * Implementation of functions setting up the graphics pipeline.
  */
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "../SourceX/display.h"
 #include "options.h"
 #include <SDL.h>

Source/engine.cpp

@@ -12,7 +12,7 @@
  */
 #include "all.h"
 #include "options.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

Source/init.cpp

@@ -8,8 +8,8 @@
 
 #include "all.h"
 #include "paths.h"
-#include "../3rdParty/Storm/Source/storm.h"
-#include "../DiabloUI/diabloui.h"
+#include "storm/storm.h"
+#include "DiabloUI/diabloui.h"
 #include <SDL.h>
 #include <config.h>
 

Source/itemdat.h

@@ -8,6 +8,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "spelldat.h"
+
 namespace devilution {
 
 /** @todo add missing values and apply */

Source/mainmenu.cpp

@@ -5,8 +5,8 @@
  */
 #include "all.h"
 #include "options.h"
-#include "../3rdParty/Storm/Source/storm.h"
-#include "../DiabloUI/diabloui.h"
+#include "storm/storm.h"
+#include "DiabloUI/diabloui.h"
 
 namespace devilution {
 

Source/monster.cpp

@@ -7,7 +7,7 @@
 
 #include "all.h"
 #include "options.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

Source/movie.cpp

@@ -4,7 +4,7 @@
  * Implementation of video playback.
  */
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "../SourceX/display.h"
 
 namespace devilution {

Source/msg.cpp

@@ -4,8 +4,8 @@
  * Implementation of function for sending and reciving network messages.
  */
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
-#include "../DiabloUI/diabloui.h"
+#include "storm/storm.h"
+#include "DiabloUI/diabloui.h"
 #include "objects.h"
 #include "options.h"
 

Source/msg.h

@@ -11,6 +11,7 @@
 #include "objects.h"
 #include "monster.h"
 #include "portal.h"
+#include "items.h"
 
 namespace devilution {
 

Source/multi.cpp

@@ -6,8 +6,8 @@
 #include "all.h"
 #include "diablo.h"
 #include "options.h"
-#include "../3rdParty/Storm/Source/storm.h"
-#include "../DiabloUI/diabloui.h"
+#include "storm/storm.h"
+#include "DiabloUI/diabloui.h"
 #include <config.h>
 
 namespace devilution {

Source/nthread.cpp

@@ -4,7 +4,7 @@
  * Implementation of functions for managing game ticks.
  */
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

Source/objects.h

@@ -7,6 +7,7 @@
 
 #include "objdat.h"
 #include "textdat.h"
+#include "itemdat.h"
 
 namespace devilution {
 

Source/options.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "pack.h"
+
 namespace devilution {
 
 struct DiabloOptions {

Source/palette.cpp

@@ -6,7 +6,7 @@
 #include "all.h"
 #include "options.h"
 #include "../SourceX/display.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

Source/pfile.cpp

@@ -7,7 +7,7 @@
 
 #include "all.h"
 #include "paths.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "file_util.h"
 
 namespace devilution {

Source/pfile.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "player.h"
-#include "../DiabloUI/diabloui.h"
+#include "DiabloUI/diabloui.h"
 
 namespace devilution {
 

Source/player.cpp

@@ -7,7 +7,7 @@
 
 #include "all.h"
 #include "options.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

Source/scrollrt.h

@@ -7,6 +7,9 @@
 
 #include <stdint.h>
 
+#include "engine.h"
+#include "miniwin.h"
+
 namespace devilution {
 
 #define PANELS_COVER (gnScreenWidth <= PANEL_WIDTH && gnScreenHeight <= SPANEL_HEIGHT + PANEL_HEIGHT)

Source/sound.cpp

@@ -5,7 +5,7 @@
  */
 #include "all.h"
 #include "options.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "../SourceX/stubs.h"
 #include "../SourceX/storm_sdl_rw.h"
 #include <SDL.h>

Source/textdat.h

@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include "effects.h"
+
 namespace devilution {
 
 enum _speech_id : int16_t {

SourceX/DiabloUI/art.cpp

@@ -1,6 +1,7 @@
 #include "DiabloUI/art.h"
 #include "display.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
+#include "sdl_compat.h"
 
 namespace devilution {
 

SourceX/DiabloUI/art.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "all.h"
 #include "../sdl_ptrs.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

SourceX/DiabloUI/diabloui.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <string>
 
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 #include "controls/controller.h"
 #include "controls/menu_controls.h"

SourceX/DiabloUI/diabloui.h

@@ -8,6 +8,7 @@
 #include "DiabloUI/art.h"
 #include "DiabloUI/ui_item.h"
 #include "display.h"
+#include "player.h"
 
 namespace devilution {
 
@@ -26,6 +27,46 @@ enum _artLogo : uint8_t {
 	LOGO_BIG,
 };
 
+enum _mainmenu_selections : uint8_t {
+	MAINMENU_NONE,
+	MAINMENU_SINGLE_PLAYER,
+	MAINMENU_MULTIPLAYER,
+	MAINMENU_REPLAY_INTRO,
+	MAINMENU_SHOW_SUPPORT,
+	MAINMENU_SHOW_CREDITS,
+	MAINMENU_EXIT_DIABLO,
+	MAINMENU_ATTRACT_MODE,
+};
+
+enum _selhero_selections : uint8_t {
+	SELHERO_NEW_DUNGEON,
+	SELHERO_CONTINUE,
+	SELHERO_CONNECT,
+	SELHERO_PREVIOUS,
+};
+
+struct _uidefaultstats {
+	Uint16 strength;
+	Uint16 magic;
+	Uint16 dexterity;
+	Uint16 vitality;
+};
+
+struct _uiheroinfo {
+	struct _uiheroinfo *next;
+	char name[16];
+	Uint16 level;
+	HeroClass heroclass;
+	Uint8 herorank;
+	Uint16 strength;
+	Uint16 magic;
+	Uint16 dexterity;
+	Uint16 vitality;
+	Sint32 gold;
+	Sint32 hassaved;
+	bool spawned;
+};
+
 extern std::array<Art, 3> ArtLogos;
 extern std::array<Art, 3> ArtFocus;
 extern Art ArtBackground;
@@ -42,6 +83,29 @@ inline SDL_Surface *DiabloUiSurface()
 	return GetOutputSurface();
 }
 
+void UiDestroy();
+void UiTitleDialog();
+void UiSetSpawned(bool bSpawned);
+void UiInitialize();
+bool UiValidPlayerName(const char *name); /* check */
+void UiSelHeroMultDialog(bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)), bool (*fncreate)(_uiheroinfo *), bool (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16]);
+void UiSelHeroSingDialog(bool (*fninfo)(bool (*fninfofunc)(_uiheroinfo *)), bool (*fncreate)(_uiheroinfo *), bool (*fnremove)(_uiheroinfo *), void (*fnstats)(unsigned int, _uidefaultstats *), _selhero_selections *dlgresult, char (*name)[16], _difficulty *difficulty);
+bool UiCreditsDialog();
+bool UiSupportDialog();
+bool UiMainMenuDialog(const char *name, _mainmenu_selections *pdwResult, void (*fnSound)(const char *file), int attractTimeOut);
+bool UiProgressDialog(const char *msg, int (*fnfunc)(), int rate);
+void UiProfileCallback();
+void UiProfileDraw();
+bool UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7);
+bool UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5);
+bool UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, char *lpBuffer, int cchBufferMax);
+bool UiSoundCallback(int a1, int type, int a3);
+bool UiDrawDescCallback(int game_type, DWORD color, const char *lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
+bool UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6);
+bool UiArtCallback(int game_type, unsigned int art_code, SDL_Color *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp);
+int UiSelectGame(GameData *gameData, int *playerId);
+int UiSelectProvider(GameData *gameData);
+void UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, Uint32 type);
 void UiFadeIn();
 void UiHandleEvents(SDL_Event *event);
 bool UiItemMouseEvents(SDL_Event *event, std::vector<UiItemBase *> items);

SourceX/DiabloUI/selconn.cpp

@@ -3,7 +3,7 @@
 #include "all.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 

SourceX/DiabloUI/selgame.cpp

@@ -1,7 +1,7 @@
 #include "selgame.h"
 
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "config.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/text.h"

SourceX/DiabloUI/selhero.cpp

@@ -5,7 +5,6 @@
 #include <random>
 
 #include "DiabloUI/diabloui.h"
-#include "../../DiabloUI/diabloui.h"
 #include "all.h"
 #include "DiabloUI/dialogs.h"
 #include "DiabloUI/scrollbar.h"

SourceX/DiabloUI/ui_item.h

@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 
-#include "all.h"
 #include "stubs.h"
 
 #include "DiabloUI/art.h"

SourceX/controls/game_controls.h

@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <SDL.h>
 
+#include "controls/controller.h"
 #include "./axis_direction.h"
-#include "./controller.h"
 
 namespace devilution {
 

SourceX/controls/touch.cpp

@@ -2,6 +2,7 @@
 #include "display.h"
 #include "options.h"
 #include "touch.h"
+#include "ui_fwd.h"
 #include <math.h>
 
 static int visible_width;

SourceX/display.h

@@ -2,10 +2,15 @@
 
 #include <cstdint>
 
-#include "all.h"
 #include "sdl_ptrs.h"
 
 #include <SDL.h>
+#ifdef USE_SDL1
+#include "sdl2_to_1_2_backports.h"
+#else
+#include "sdl2_backports.h"
+#endif
+
 #include <type_traits>
 
 namespace devilution {

SourceX/dvlnet/abstract_net.cpp

@@ -8,7 +8,7 @@
 #include "dvlnet/protocol_zt.h"
 #endif
 #include "dvlnet/loopback.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 namespace net {

SourceX/dvlnet/abstract_net.h

@@ -6,7 +6,7 @@
 #include <exception>
 
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 namespace devilution {
 namespace net {

SourceX/storm/storm.cpp

@@ -5,7 +5,7 @@
 #include "all.h"
 #include "options.h"
 #include "paths.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 
 #if !SDL_VERSION_ATLEAST(2, 0, 4)
 #include <queue>

SourceX/storm/storm.h

@@ -3,6 +3,10 @@
 #include <cstdint>
 #include <limits>
 #include <string>
+
+#include "appfat.h"
+#include "multi.h"
+
 namespace devilution {
 
 enum game_info : uint8_t {

SourceX/storm_sdl_rw.cpp

@@ -4,7 +4,7 @@
 #include <cstring>
 
 #include "all.h"
-#include "../3rdParty/Storm/Source/storm.h"
+#include "storm/storm.h"
 #include "../Source/engine.h"
 
 namespace devilution {