From 20621a0642fa15d8ffc44cce50bdd61472b863fe Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 14 Feb 2020 13:12:54 +0100 Subject: [PATCH] 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 | 86 +++++++++++++++++++++++++++++++++++++++++++++ Source/appfat.cpp | 2 +- Source/automap.cpp | 2 +- Source/capture.cpp | 2 +- Source/codec.cpp | 2 +- Source/control.cpp | 2 +- Source/cursor.cpp | 2 +- Source/dead.cpp | 2 +- Source/debug.cpp | 2 +- Source/diablo.cpp | 2 +- Source/diablo.h | 81 ------------------------------------------ Source/doom.cpp | 2 +- Source/drlg_l1.cpp | 2 +- Source/drlg_l2.cpp | 2 +- Source/drlg_l3.cpp | 2 +- Source/drlg_l4.cpp | 2 +- Source/dthread.cpp | 2 +- Source/dx.cpp | 2 +- Source/effects.cpp | 2 +- Source/encrypt.cpp | 2 +- Source/engine.cpp | 2 +- Source/error.cpp | 2 +- Source/fault.cpp | 2 +- Source/gamemenu.cpp | 2 +- Source/gendung.cpp | 2 +- Source/gmenu.cpp | 2 +- Source/help.cpp | 2 +- Source/init.cpp | 2 +- Source/interfac.cpp | 2 +- Source/inv.cpp | 2 +- Source/itemdat.cpp | 2 +- Source/items.cpp | 2 +- Source/lighting.cpp | 2 +- Source/loadsave.cpp | 2 +- Source/logging.cpp | 2 +- Source/mainmenu.cpp | 2 +- Source/minitext.cpp | 2 +- Source/misdat.cpp | 2 +- Source/missiles.cpp | 2 +- Source/monstdat.cpp | 2 +- Source/monster.cpp | 2 +- Source/movie.cpp | 2 +- Source/mpqapi.cpp | 2 +- Source/msg.cpp | 2 +- Source/msgcmd.cpp | 2 +- Source/multi.cpp | 2 +- Source/nthread.cpp | 2 +- Source/objdat.cpp | 2 +- Source/objects.cpp | 2 +- Source/pack.cpp | 2 +- Source/palette.cpp | 2 +- Source/path.cpp | 2 +- Source/pfile.cpp | 2 +- Source/player.cpp | 2 +- Source/plrmsg.cpp | 2 +- Source/portal.cpp | 2 +- Source/quests.cpp | 2 +- Source/render.cpp | 2 +- Source/restrict.cpp | 2 +- Source/scrollrt.cpp | 2 +- Source/setmaps.cpp | 2 +- Source/sha.cpp | 2 +- Source/sound.cpp | 2 +- Source/spelldat.cpp | 2 +- Source/spells.cpp | 2 +- Source/stores.cpp | 2 +- Source/sync.cpp | 2 +- Source/textdat.cpp | 2 +- Source/themes.cpp | 2 +- Source/tmsg.cpp | 2 +- Source/town.cpp | 2 +- Source/towners.cpp | 2 +- Source/track.cpp | 2 +- Source/trigs.cpp | 2 +- Source/wave.cpp | 2 +- 75 files changed, 159 insertions(+), 154 deletions(-) create mode 100644 Source/all.h diff --git a/Source/all.h b/Source/all.h new file mode 100644 index 00000000..4a19fbbf --- /dev/null +++ b/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__ */ diff --git a/Source/appfat.cpp b/Source/appfat.cpp index 41154a07..51be3e1d 100644 --- a/Source/appfat.cpp +++ b/Source/appfat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" char sz_error_buf[256]; diff --git a/Source/automap.cpp b/Source/automap.cpp index 7f1726c3..57867d61 100644 --- a/Source/automap.cpp +++ b/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]; diff --git a/Source/capture.cpp b/Source/capture.cpp index b0583f53..ce3a07bf 100644 --- a/Source/capture.cpp +++ b/Source/capture.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" static BOOL CaptureHdr(HANDLE hFile, short width, short height) { diff --git a/Source/codec.cpp b/Source/codec.cpp index 157c2314..835cf447 100644 --- a/Source/codec.cpp +++ b/Source/codec.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" struct CodecSignature { DWORD checksum; diff --git a/Source/control.cpp b/Source/control.cpp index 8f548ead..881197b3 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BYTE sgbNextTalkSave; BYTE sgbTalkSavePos; diff --git a/Source/cursor.cpp b/Source/cursor.cpp index 9e590080..d463c15a 100644 --- a/Source/cursor.cpp +++ b/Source/cursor.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int cursH; int icursH28; diff --git a/Source/dead.cpp b/Source/dead.cpp index eb4f8727..00e87d27 100644 --- a/Source/dead.cpp +++ b/Source/dead.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" // unused, this was probably for blood boil/burn int spurtndx; diff --git a/Source/debug.cpp b/Source/debug.cpp index a260b25b..f01542c6 100644 --- a/Source/debug.cpp +++ b/Source/debug.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #ifdef _DEBUG BOOL update_seed_check = FALSE; diff --git a/Source/diablo.cpp b/Source/diablo.cpp index f9357e9c..9bff14ef 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #include "../DiabloUI/diabloui.h" diff --git a/Source/diablo.h b/Source/diablo.h index 84de4553..8127673e 100644 --- a/Source/diablo.h +++ b/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]; diff --git a/Source/doom.cpp b/Source/doom.cpp index 03d7fe2e..b336849e 100644 --- a/Source/doom.cpp +++ b/Source/doom.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int doom_quest_time; int doom_stars_drawn; diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp index cfa0eb0c..64391da7 100644 --- a/Source/drlg_l1.cpp +++ b/Source/drlg_l1.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BYTE L5dungeon[80][80]; BYTE L5dflags[DMAXX][DMAXY]; diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp index f7f7ad19..b66ccab9 100644 --- a/Source/drlg_l2.cpp +++ b/Source/drlg_l2.cpp @@ -1,5 +1,5 @@ #ifndef SPAWN -#include "diablo.h" +#include "all.h" int nSx1; int nSx2; diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp index 5c0a8526..43a1a67e 100644 --- a/Source/drlg_l3.cpp +++ b/Source/drlg_l3.cpp @@ -1,5 +1,5 @@ #ifndef SPAWN -#include "diablo.h" +#include "all.h" BOOLEAN lavapool; int abyssx; diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp index 9097dce6..9cf009bf 100644 --- a/Source/drlg_l4.cpp +++ b/Source/drlg_l4.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int diabquad1x; int diabquad1y; diff --git a/Source/dthread.cpp b/Source/dthread.cpp index 2c268c25..b17457cf 100644 --- a/Source/dthread.cpp +++ b/Source/dthread.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #ifdef __cplusplus diff --git a/Source/dx.cpp b/Source/dx.cpp index 149541f1..99c5dc33 100644 --- a/Source/dx.cpp +++ b/Source/dx.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" BYTE *sgpBackBuf; diff --git a/Source/effects.cpp b/Source/effects.cpp index 3bb4207d..0afb731a 100644 --- a/Source/effects.cpp +++ b/Source/effects.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" int sfxdelay; diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp index a1d28721..50abc783 100644 --- a/Source/encrypt.cpp +++ b/Source/encrypt.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/PKWare/pkware.h" DWORD hashtable[1280]; diff --git a/Source/engine.cpp b/Source/engine.cpp index 5f45e523..2278ccdb 100644 --- a/Source/engine.cpp +++ b/Source/engine.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #ifdef USE_ASM diff --git a/Source/error.cpp b/Source/error.cpp index 557198b6..6a87b9c8 100644 --- a/Source/error.cpp +++ b/Source/error.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" char msgtable[MAX_SEND_STR_LEN]; char msgdelay; diff --git a/Source/fault.cpp b/Source/fault.cpp index 72326f63..64d2f5d8 100644 --- a/Source/fault.cpp +++ b/Source/fault.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter; diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 0445a70a..09124e8d 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" TMenuItem sgSingleMenu[6] = { // clang-format off diff --git a/Source/gendung.cpp b/Source/gendung.cpp index 06a85a05..e9c0cde3 100644 --- a/Source/gendung.cpp +++ b/Source/gendung.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" WORD level_frame_types[MAXTILES]; int themeCount; diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp index c25c6c71..3c4d4fe1 100644 --- a/Source/gmenu.cpp +++ b/Source/gmenu.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BYTE *optbar_cel; BOOLEAN mouseNavigation; diff --git a/Source/help.cpp b/Source/help.cpp index 8996ac2e..0922e1a5 100644 --- a/Source/help.cpp +++ b/Source/help.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int help_select_line; int dword_634494; diff --git a/Source/init.cpp b/Source/init.cpp index 9bbd57ce..d57d9138 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #include "../DiabloUI/diabloui.h" diff --git a/Source/interfac.cpp b/Source/interfac.cpp index 277d3627..e3b3ebd1 100644 --- a/Source/interfac.cpp +++ b/Source/interfac.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" void *sgpBackCel; diff --git a/Source/inv.cpp b/Source/inv.cpp index 224c2ba4..371fd41f 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BOOL invflag; BYTE *pInvCels; diff --git a/Source/itemdat.cpp b/Source/itemdat.cpp index 39476441..887ab8b7 100644 --- a/Source/itemdat.cpp +++ b/Source/itemdat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" ItemDataStruct AllItemsList[] = { // clang-format off diff --git a/Source/items.cpp b/Source/items.cpp index 048dff47..22ee22a3 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int itemactive[MAXITEMS]; BOOL uitemflag; diff --git a/Source/lighting.cpp b/Source/lighting.cpp index 21ca4a3a..5343d3c6 100644 --- a/Source/lighting.cpp +++ b/Source/lighting.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" LightListStruct VisionList[MAXVISION]; BYTE lightactive[MAXLIGHTS]; diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index cc31275f..cbbf4ebc 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BYTE *tbuff; diff --git a/Source/logging.cpp b/Source/logging.cpp index 05d4d688..c0ea8a7c 100644 --- a/Source/logging.cpp +++ b/Source/logging.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #ifdef __cplusplus diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp index 039ad6e8..1c66f703 100644 --- a/Source/mainmenu.cpp +++ b/Source/mainmenu.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #include "../DiabloUI/diabloui.h" diff --git a/Source/minitext.cpp b/Source/minitext.cpp index 0a250b00..4ef780a1 100644 --- a/Source/minitext.cpp +++ b/Source/minitext.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int qtexty; char *qtextptr; diff --git a/Source/misdat.cpp b/Source/misdat.cpp index 142b975c..6449e655 100644 --- a/Source/misdat.cpp +++ b/Source/misdat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" MissileData missiledata[] = { // clang-format off diff --git a/Source/missiles.cpp b/Source/missiles.cpp index af914421..96910d80 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int missileactive[MAXMISSILES]; int missileavail[MAXMISSILES]; diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp index a4e029e0..c9bed996 100644 --- a/Source/monstdat.cpp +++ b/Source/monstdat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" MonsterData monsterdata[] = { // clang-format off diff --git a/Source/monster.cpp b/Source/monster.cpp index b1d966a4..924ba107 100644 --- a/Source/monster.cpp +++ b/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 diff --git a/Source/movie.cpp b/Source/movie.cpp index e8d819fc..40c513c3 100644 --- a/Source/movie.cpp +++ b/Source/movie.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" BYTE movie_playing; diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp index 25435212..985eb25b 100644 --- a/Source/mpqapi.cpp +++ b/Source/mpqapi.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" DWORD sgdwMpqOffset; diff --git a/Source/msg.cpp b/Source/msg.cpp index 693abe1f..7d2a27e6 100644 --- a/Source/msg.cpp +++ b/Source/msg.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #include "../DiabloUI/diabloui.h" diff --git a/Source/msgcmd.cpp b/Source/msgcmd.cpp index 5122c2c1..26bd5bbb 100644 --- a/Source/msgcmd.cpp +++ b/Source/msgcmd.cpp @@ -2,7 +2,7 @@ #include // for offsetof #include // for typeid -#include "diablo.h" +#include "all.h" #include "list.h" #define COMMAND_LEN 128 diff --git a/Source/multi.cpp b/Source/multi.cpp index 1d2f8532..75da357f 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #include "../DiabloUI/diabloui.h" diff --git a/Source/nthread.cpp b/Source/nthread.cpp index ebbc4f62..4911067a 100644 --- a/Source/nthread.cpp +++ b/Source/nthread.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" BYTE sgbNetUpdateRate; diff --git a/Source/objdat.cpp b/Source/objdat.cpp index d21bb893..e61f9c4f 100644 --- a/Source/objdat.cpp +++ b/Source/objdat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int ObjTypeConv[113] = { 0, diff --git a/Source/objects.cpp b/Source/objects.cpp index 497e8195..07b3a32e 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int trapid; int trapdir; diff --git a/Source/pack.cpp b/Source/pack.cpp index 920121c3..2ebe3946 100644 --- a/Source/pack.cpp +++ b/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) diff --git a/Source/palette.cpp b/Source/palette.cpp index 93cadc93..65d35665 100644 --- a/Source/palette.cpp +++ b/Source/palette.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" PALETTEENTRY logical_palette[256]; diff --git a/Source/path.cpp b/Source/path.cpp index 796ddb28..d0dd05d7 100644 --- a/Source/path.cpp +++ b/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]; diff --git a/Source/pfile.cpp b/Source/pfile.cpp index e3f964c0..9fea06a5 100644 --- a/Source/pfile.cpp +++ b/Source/pfile.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" #include "../DiabloUI/diabloui.h" diff --git a/Source/player.cpp b/Source/player.cpp index b3609686..9186d2c8 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" int plr_lframe_size; diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp index 09c6fe84..185739f3 100644 --- a/Source/plrmsg.cpp +++ b/Source/plrmsg.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" static BYTE plr_msg_slot; _plrmsg plr_msgs[PMSG_COUNT]; diff --git a/Source/portal.cpp b/Source/portal.cpp index edf94618..038c33d8 100644 --- a/Source/portal.cpp +++ b/Source/portal.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" PortalStruct portal[MAXPORTAL]; int portalindex; diff --git a/Source/quests.cpp b/Source/quests.cpp index 21d1e3f2..5517d745 100644 --- a/Source/quests.cpp +++ b/Source/quests.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int qtopline; BOOL questlog; diff --git a/Source/render.cpp b/Source/render.cpp index bf740a63..c4ff1e4d 100644 --- a/Source/render.cpp +++ b/Source/render.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "_asm.cpp" int WorldBoolFlag = 0; diff --git a/Source/restrict.cpp b/Source/restrict.cpp index 643c54c5..0522480c 100644 --- a/Source/restrict.cpp +++ b/Source/restrict.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BOOL SystemSupported() { diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index ff6b5928..4bd01159 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" int light_table_index; diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp index 273eea86..51b0a345 100644 --- a/Source/setmaps.cpp +++ b/Source/setmaps.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" // BUGFIX: constant data should be const BYTE SkelKingTrans1[8] = { diff --git a/Source/sha.cpp b/Source/sha.cpp index 2e851435..14ac7133 100644 --- a/Source/sha.cpp +++ b/Source/sha.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" SHA1Context sgSHA1[3]; diff --git a/Source/sound.cpp b/Source/sound.cpp index 19fabfaf..b7de83ae 100644 --- a/Source/sound.cpp +++ b/Source/sound.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" LPDIRECTSOUNDBUFFER DSBs[8]; diff --git a/Source/spelldat.cpp b/Source/spelldat.cpp index 84a02cce..8337d598 100644 --- a/Source/spelldat.cpp +++ b/Source/spelldat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" SpellData spelldata[MAX_SPELLS] = { // clang-format off diff --git a/Source/spells.cpp b/Source/spells.cpp index f95ce8f8..5cb38763 100644 --- a/Source/spells.cpp +++ b/Source/spells.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int GetManaAmount(int id, int sn) { diff --git a/Source/stores.cpp b/Source/stores.cpp index 04bfcdde..ab9990e2 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int stextup; int storenumh; diff --git a/Source/sync.cpp b/Source/sync.cpp index d817471d..636c8afc 100644 --- a/Source/sync.cpp +++ b/Source/sync.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" WORD sync_word_6AA708[MAXMONSTERS]; int sgnMonsters; diff --git a/Source/textdat.cpp b/Source/textdat.cpp index 2484a0c7..b3432759 100644 --- a/Source/textdat.cpp +++ b/Source/textdat.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" /* todo: move text out of struct */ diff --git a/Source/themes.cpp b/Source/themes.cpp index 508e85c1..4c9a8ddd 100644 --- a/Source/themes.cpp +++ b/Source/themes.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" int numthemes; BOOL armorFlag; diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp index 634d1b21..27783f1e 100644 --- a/Source/tmsg.cpp +++ b/Source/tmsg.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" static TMsg *sgpTimedMsgHead; diff --git a/Source/town.cpp b/Source/town.cpp index 6d804f63..3289caaf 100644 --- a/Source/town.cpp +++ b/Source/town.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" /** * Used under building to avoid HOM and outside of level diff --git a/Source/towners.cpp b/Source/towners.cpp index 65abc2ed..09782e23 100644 --- a/Source/towners.cpp +++ b/Source/towners.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BOOL storeflag; int sgnCowMsg; diff --git a/Source/track.cpp b/Source/track.cpp index 86f3d5f1..11552f0d 100644 --- a/Source/track.cpp +++ b/Source/track.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" static BYTE sgbIsScrolling; diff --git a/Source/trigs.cpp b/Source/trigs.cpp index 1265404f..04447c0b 100644 --- a/Source/trigs.cpp +++ b/Source/trigs.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" BOOL townwarps[3]; BOOL trigflag; diff --git a/Source/wave.cpp b/Source/wave.cpp index d7f753a4..fa8bd799 100644 --- a/Source/wave.cpp +++ b/Source/wave.cpp @@ -1,4 +1,4 @@ -#include "diablo.h" +#include "all.h" #include "../3rdParty/Storm/Source/storm.h" BOOL WCloseFile(HANDLE file)