add all.h and use in place of diablo.h (#2005)

Now diablo.h is treated in the same way as all other header files of
Source, as it only contains the declarations of global variables and
functions of diablo.cpp.

Besides consistency, this also enables mods to include diablo.h just
like any other header file without having to include every header file
(and without having to include C++ specific aspects of the now all.h).

Source/all.h

@@ -0,0 +1,86 @@
+#ifndef __ALL_H__
+#define __ALL_H__
+
+#include "../types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "appfat.h"
+#include "automap.h"
+#include "capture.h"
+#include "codec.h"
+#include "control.h"
+#include "cursor.h"
+#include "dead.h"
+#include "debug.h"
+#include "diablo.h"
+#include "doom.h"
+#include "drlg_l1.h"
+#include "drlg_l2.h"
+#include "drlg_l3.h"
+#include "drlg_l4.h"
+#include "dthread.h"
+#include "dx.h"
+#include "effects.h"
+#include "encrypt.h"
+#include "engine.h"
+#include "error.h"
+#include "fault.h"
+#include "gamemenu.h"
+#include "gendung.h"
+#include "gmenu.h"
+#include "help.h"
+#include "init.h"
+#include "interfac.h"
+#include "inv.h"
+#include "itemdat.h"
+#include "items.h"
+#include "lighting.h"
+#include "loadsave.h"
+#include "logging.h"
+#include "mainmenu.h"
+#include "minitext.h"
+#include "misdat.h"
+#include "missiles.h"
+#include "monstdat.h"
+#include "monster.h"
+#include "movie.h"
+#include "mpqapi.h"
+#include "msg.h"
+#include "msgcmd.h"
+#include "multi.h"
+#include "nthread.h"
+#include "objdat.h"
+#include "objects.h"
+#include "pack.h"
+#include "palette.h"
+#include "path.h"
+#include "pfile.h"
+#include "player.h"
+#include "plrmsg.h"
+#include "portal.h"
+#include "quests.h"
+#include "restrict.h"
+#include "scrollrt.h"
+#include "setmaps.h"
+#include "sha.h"
+#include "sound.h"
+#include "spelldat.h"
+#include "spells.h"
+#include "stores.h"
+#include "sync.h"
+#include "textdat.h" // check file name
+#include "themes.h"
+#include "tmsg.h"
+#include "town.h"
+#include "towners.h"
+#include "track.h"
+#include "trigs.h"
+#include "wave.h"
+#include "render.h" // linked last, likely .s/.asm
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ALL_H__ */

Source/appfat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 char sz_error_buf[256];

Source/automap.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 // BUGFIX: only the first 256 elements are ever read
 WORD automaptype[512];

Source/capture.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 static BOOL CaptureHdr(HANDLE hFile, short width, short height)
 {

Source/codec.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 struct CodecSignature {
 	DWORD checksum;

Source/control.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BYTE sgbNextTalkSave;
 BYTE sgbTalkSavePos;

Source/cursor.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int cursH;
 int icursH28;

Source/dead.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 // unused, this was probably for blood boil/burn
 int spurtndx;

Source/debug.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 #ifdef _DEBUG
 BOOL update_seed_check = FALSE;

Source/diablo.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 

Source/diablo.h

@@ -2,87 +2,6 @@
 #ifndef __DIABLO_H__
 #define __DIABLO_H__
 
-#include "../types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "appfat.h"
-#include "automap.h"
-#include "capture.h"
-#include "codec.h"
-#include "control.h"
-#include "cursor.h"
-#include "dead.h"
-#include "debug.h"
-#include "doom.h"
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
-#include "dthread.h"
-#include "dx.h"
-#include "effects.h"
-#include "encrypt.h"
-#include "engine.h"
-#include "error.h"
-#include "fault.h"
-#include "gamemenu.h"
-#include "gendung.h"
-#include "gmenu.h"
-#include "help.h"
-#include "init.h"
-#include "interfac.h"
-#include "inv.h"
-#include "itemdat.h"
-#include "items.h"
-#include "lighting.h"
-#include "loadsave.h"
-#include "logging.h"
-#include "mainmenu.h"
-#include "minitext.h"
-#include "misdat.h"
-#include "missiles.h"
-#include "monstdat.h"
-#include "monster.h"
-#include "movie.h"
-#include "mpqapi.h"
-#include "msg.h"
-#include "msgcmd.h"
-#include "multi.h"
-#include "nthread.h"
-#include "objdat.h"
-#include "objects.h"
-#include "pack.h"
-#include "palette.h"
-#include "path.h"
-#include "pfile.h"
-#include "player.h"
-#include "plrmsg.h"
-#include "portal.h"
-#include "quests.h"
-#include "restrict.h"
-#include "scrollrt.h"
-#include "setmaps.h"
-#include "sha.h"
-#include "sound.h"
-#include "spelldat.h"
-#include "spells.h"
-#include "stores.h"
-#include "sync.h"
-#include "textdat.h" // check file name
-#include "themes.h"
-#include "tmsg.h"
-#include "town.h"
-#include "towners.h"
-#include "track.h"
-#include "trigs.h"
-#include "wave.h"
-#include "render.h" // linked last, likely .s/.asm
-#ifdef __cplusplus
-}
-#endif
-
 extern HWND ghMainWnd;
 extern int glMid1Seed[NUMLEVELS];
 extern int glMid2Seed[NUMLEVELS];

Source/doom.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int doom_quest_time;
 int doom_stars_drawn;

Source/drlg_l1.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BYTE L5dungeon[80][80];
 BYTE L5dflags[DMAXX][DMAXY];

Source/drlg_l2.cpp

@@ -1,5 +1,5 @@
 #ifndef SPAWN
-#include "diablo.h"
+#include "all.h"
 
 int nSx1;
 int nSx2;

Source/drlg_l3.cpp

@@ -1,5 +1,5 @@
 #ifndef SPAWN
-#include "diablo.h"
+#include "all.h"
 
 BOOLEAN lavapool;
 int abyssx;

Source/drlg_l4.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int diabquad1x;
 int diabquad1y;

Source/dthread.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 #ifdef __cplusplus

Source/dx.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 BYTE *sgpBackBuf;

Source/effects.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 int sfxdelay;

Source/encrypt.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/PKWare/pkware.h"
 
 DWORD hashtable[1280];

Source/engine.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 #ifdef USE_ASM

Source/error.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 char msgtable[MAX_SEND_STR_LEN];
 char msgdelay;

Source/fault.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter;
 

Source/gamemenu.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 TMenuItem sgSingleMenu[6] = {
 	// clang-format off

Source/gendung.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 WORD level_frame_types[MAXTILES];
 int themeCount;

Source/gmenu.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BYTE *optbar_cel;
 BOOLEAN mouseNavigation;

Source/help.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int help_select_line;
 int dword_634494;

Source/init.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 

Source/interfac.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 void *sgpBackCel;

Source/inv.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BOOL invflag;
 BYTE *pInvCels;

Source/itemdat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 ItemDataStruct AllItemsList[] = {
 	// clang-format off

Source/items.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int itemactive[MAXITEMS];
 BOOL uitemflag;

Source/lighting.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 LightListStruct VisionList[MAXVISION];
 BYTE lightactive[MAXLIGHTS];

Source/loadsave.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BYTE *tbuff;
 

Source/logging.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 #ifdef __cplusplus

Source/mainmenu.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 

Source/minitext.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int qtexty;
 char *qtextptr;

Source/misdat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 MissileData missiledata[] = {
 	// clang-format off

Source/missiles.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int missileactive[MAXMISSILES];
 int missileavail[MAXMISSILES];

Source/monstdat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 MonsterData monsterdata[] = {
 	// clang-format off

Source/monster.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 // Tracks which missile files are already loaded

Source/movie.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 BYTE movie_playing;

Source/mpqapi.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 DWORD sgdwMpqOffset;

Source/msg.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 

Source/msgcmd.cpp

@@ -2,7 +2,7 @@
 #include <stddef.h> // for offsetof
 #include <typeinfo> // for typeid
 
-#include "diablo.h"
+#include "all.h"
 #include "list.h"
 
 #define COMMAND_LEN 128

Source/multi.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 

Source/nthread.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 BYTE sgbNetUpdateRate;

Source/objdat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int ObjTypeConv[113] = {
 	0,

Source/objects.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int trapid;
 int trapdir;

Source/pack.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 static void PackItem(PkItemStruct *id, ItemStruct *is)

Source/palette.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 PALETTEENTRY logical_palette[256];

Source/path.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 // preallocated nodes, search is terminated after 300 nodes are visited
 PATHNODE path_nodes[MAXPATHNODES];

Source/pfile.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 #include "../DiabloUI/diabloui.h"
 

Source/player.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 int plr_lframe_size;

Source/plrmsg.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 static BYTE plr_msg_slot;
 _plrmsg plr_msgs[PMSG_COUNT];

Source/portal.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 PortalStruct portal[MAXPORTAL];
 int portalindex;

Source/quests.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int qtopline;
 BOOL questlog;

Source/render.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "_asm.cpp"
 
 int WorldBoolFlag = 0;

Source/restrict.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BOOL SystemSupported()
 {

Source/scrollrt.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 int light_table_index;

Source/setmaps.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 // BUGFIX: constant data should be const
 BYTE SkelKingTrans1[8] = {

Source/sha.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 SHA1Context sgSHA1[3];
 

Source/sound.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 LPDIRECTSOUNDBUFFER DSBs[8];

Source/spelldat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 SpellData spelldata[MAX_SPELLS] = {
 	// clang-format off

Source/spells.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int GetManaAmount(int id, int sn)
 {

Source/stores.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int stextup;
 int storenumh;

Source/sync.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 WORD sync_word_6AA708[MAXMONSTERS];
 int sgnMonsters;

Source/textdat.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 /* todo: move text out of struct */
 

Source/themes.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 int numthemes;
 BOOL armorFlag;

Source/tmsg.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 static TMsg *sgpTimedMsgHead;
 

Source/town.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 /**
  * Used under building to avoid HOM and outside of level

Source/towners.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BOOL storeflag;
 int sgnCowMsg;

Source/track.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 static BYTE sgbIsScrolling;

Source/trigs.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 
 BOOL townwarps[3];
 BOOL trigflag;

Source/wave.cpp

@@ -1,4 +1,4 @@
-#include "diablo.h"
+#include "all.h"
 #include "../3rdParty/Storm/Source/storm.h"
 
 BOOL WCloseFile(HANDLE file)