From 64d26a7934ba37fdb093fc28a3e1fec669340c2d Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Sat, 18 Apr 2020 14:07:48 +0200 Subject: [PATCH] Sanitize use of namespace Wrap individual headers in dvl namespace to prevent including standard header in another namespace. --- Source/all.h | 8 -------- Source/appfat.h | 4 ++++ Source/automap.h | 4 ++++ Source/capture.h | 4 ++++ Source/codec.h | 4 ++++ Source/control.h | 4 ++++ Source/cursor.h | 4 ++++ Source/dead.h | 4 ++++ Source/debug.h | 4 ++++ Source/diablo.h | 4 ++++ Source/doom.h | 4 ++++ Source/drlg_l1.h | 4 ++++ Source/drlg_l2.h | 4 ++++ Source/drlg_l3.h | 4 ++++ Source/drlg_l4.h | 4 ++++ Source/dthread.h | 3 +++ Source/dx.h | 3 +++ Source/effects.h | 3 +++ Source/encrypt.h | 4 ++++ Source/engine.h | 4 ++++ Source/error.h | 4 ++++ Source/gamemenu.h | 4 ++++ Source/gendung.h | 4 ++++ Source/gmenu.h | 4 ++++ Source/help.h | 4 ++++ Source/init.h | 4 ++++ Source/interfac.h | 4 ++++ Source/inv.h | 4 ++++ Source/itemdat.h | 4 ++++ Source/items.h | 4 ++++ Source/lighting.h | 4 ++++ Source/loadsave.h | 4 ++++ Source/mainmenu.h | 4 ++++ Source/minitext.h | 4 ++++ Source/misdat.h | 4 ++++ Source/missiles.h | 4 ++++ Source/monstdat.h | 4 ++++ Source/monster.h | 4 ++++ Source/movie.h | 4 ++++ Source/mpqapi.h | 4 ++++ Source/msg.h | 4 ++++ Source/multi.h | 4 ++++ Source/nthread.h | 3 +++ Source/objdat.h | 4 ++++ Source/objects.h | 4 ++++ Source/pack.h | 3 +++ Source/palette.h | 4 ++++ Source/path.h | 4 ++++ Source/pfile.h | 3 +++ Source/player.h | 4 ++++ Source/plrmsg.h | 4 ++++ Source/portal.h | 4 ++++ Source/quests.h | 4 ++++ Source/render.h | 4 ++++ Source/restrict.h | 4 ++++ Source/scrollrt.h | 4 ++++ Source/setmaps.h | 4 ++++ Source/sha.h | 4 ++++ Source/sound.h | 4 ++++ Source/spelldat.h | 4 ++++ Source/spells.h | 4 ++++ Source/stores.h | 3 +++ Source/sync.h | 4 ++++ Source/textdat.h | 3 +++ Source/themes.h | 3 +++ Source/tmsg.h | 3 +++ Source/town.h | 3 +++ Source/towners.h | 3 +++ Source/track.h | 4 ++++ Source/trigs.h | 3 +++ Source/wave.h | 4 ++++ enums.h | 4 ++++ structs.h | 4 ++++ types.h | 2 -- 74 files changed, 275 insertions(+), 10 deletions(-) diff --git a/Source/all.h b/Source/all.h index 72b21c4e4..30abce1f6 100644 --- a/Source/all.h +++ b/Source/all.h @@ -18,9 +18,6 @@ #include "../types.h" -#ifdef __cplusplus -extern "C" { -#endif #include "appfat.h" #include "automap.h" #include "capture.h" @@ -91,10 +88,5 @@ extern "C" { #include "trigs.h" #include "wave.h" #include "render.h" // linked last, likely .s/.asm -#ifdef __cplusplus -} -#endif - -DEVILUTION_END_NAMESPACE #endif /* __ALL_H__ */ diff --git a/Source/appfat.h b/Source/appfat.h index 6200d6a03..d0089cb53 100644 --- a/Source/appfat.h +++ b/Source/appfat.h @@ -6,6 +6,8 @@ #ifndef __APPFAT_H__ #define __APPFAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern char sz_error_buf[256]; extern BOOL terminating; extern int cleanup_thread_id; @@ -30,4 +32,6 @@ void DiskFreeDlg(char *error); void InsertCDDlg(const char *fileName); void DirErrorDlg(char *error); +DEVILUTION_END_NAMESPACE + #endif /* __APPFAT_H__ */ diff --git a/Source/automap.h b/Source/automap.h index 219b0e74b..85aab23b2 100644 --- a/Source/automap.h +++ b/Source/automap.h @@ -6,6 +6,8 @@ #ifndef __AUTOMAP_H__ #define __AUTOMAP_H__ +DEVILUTION_BEGIN_NAMESPACE + extern WORD automaptype[512]; extern BOOL automapflag; extern char AmShiftTab[31]; @@ -36,4 +38,6 @@ void DrawAutomapText(); void SetAutomapView(int x, int y); void AutomapZoomReset(); +DEVILUTION_END_NAMESPACE + #endif /* __AUTOMAP_H__ */ diff --git a/Source/capture.h b/Source/capture.h index 9a54e2d11..f8879e046 100644 --- a/Source/capture.h +++ b/Source/capture.h @@ -6,6 +6,10 @@ #ifndef __CAPTURE_H__ #define __CAPTURE_H__ +DEVILUTION_BEGIN_NAMESPACE + void CaptureScreen(); +DEVILUTION_END_NAMESPACE + #endif /* __CAPTURE_H__ */ diff --git a/Source/codec.h b/Source/codec.h index 00c11ceab..78b1f780f 100644 --- a/Source/codec.h +++ b/Source/codec.h @@ -6,9 +6,13 @@ #ifndef __CODEC_H__ #define __CODEC_H__ +DEVILUTION_BEGIN_NAMESPACE + int codec_decode(BYTE *pbSrcDst, DWORD size, char *pszPassword); void codec_init_key(int unused, char *pszPassword); DWORD codec_get_encoded_len(DWORD dwSrcBytes); void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, char *pszPassword); +DEVILUTION_END_NAMESPACE + #endif /* __CODEC_H__ */ diff --git a/Source/control.h b/Source/control.h index 65e3be261..5af6b989c 100644 --- a/Source/control.h +++ b/Source/control.h @@ -6,6 +6,8 @@ #ifndef __CONTROL_H__ #define __CONTROL_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE *pDurIcons; extern BYTE *pChrButtons; extern BOOL drawhpflag; @@ -137,4 +139,6 @@ extern char *PanBtnStr[8]; extern RECT32 ChrBtnsRect[4]; extern int SpellPages[6][7]; +DEVILUTION_END_NAMESPACE + #endif /* __CONTROL_H__ */ diff --git a/Source/cursor.h b/Source/cursor.h index 42da1ff94..3501e31ed 100644 --- a/Source/cursor.h +++ b/Source/cursor.h @@ -6,6 +6,8 @@ #ifndef __CURSOR_H__ #define __CURSOR_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int cursW; extern int cursH; extern int pcursmonst; @@ -37,4 +39,6 @@ void CheckCursMove(); extern const int InvItemWidth[]; extern const int InvItemHeight[]; +DEVILUTION_END_NAMESPACE + #endif /* __CURSOR_H__ */ diff --git a/Source/dead.h b/Source/dead.h index f9e992a22..1f6160d45 100644 --- a/Source/dead.h +++ b/Source/dead.h @@ -6,6 +6,8 @@ #ifndef __DEAD_H__ #define __DEAD_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int spurtndx; extern DeadStruct dead[MAXDEAD]; extern int stonendx; @@ -14,4 +16,6 @@ void InitDead(); void AddDead(int dx, int dy, char dv, int ddir); void SetDead(); +DEVILUTION_END_NAMESPACE + #endif /* __DEAD_H__ */ diff --git a/Source/debug.h b/Source/debug.h index 1fee72aa8..691f67a6a 100644 --- a/Source/debug.h +++ b/Source/debug.h @@ -6,6 +6,8 @@ #ifndef __DEBUG_H__ #define __DEBUG_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE *pSquareCel; extern char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY]; extern char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY]; @@ -27,4 +29,6 @@ void GetDebugMonster(); void NextDebugMonster(); #endif +DEVILUTION_END_NAMESPACE + #endif /* __DEBUG_H__ */ diff --git a/Source/diablo.h b/Source/diablo.h index c16f6272f..572d0273f 100644 --- a/Source/diablo.h +++ b/Source/diablo.h @@ -6,6 +6,8 @@ #ifndef __DIABLO_H__ #define __DIABLO_H__ +DEVILUTION_BEGIN_NAMESPACE + extern SDL_Window *ghMainWnd; extern DWORD glSeedTbl[NUMLEVELS]; extern int gnLevelTypeTbl[NUMLEVELS]; @@ -103,4 +105,6 @@ extern BOOL FriendlyMode; extern char *spszMsgTbl[4]; extern char *spszMsgHotKeyTbl[4]; +DEVILUTION_END_NAMESPACE + #endif /* __DIABLO_H__ */ diff --git a/Source/doom.h b/Source/doom.h index b72b2c331..26a50c08f 100644 --- a/Source/doom.h +++ b/Source/doom.h @@ -6,6 +6,8 @@ #ifndef __DOOM_H__ #define __DOOM_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int doom_quest_time; extern int doom_stars_drawn; extern BYTE *pDoomCel; @@ -24,4 +26,6 @@ void doom_init(); void doom_close(); void doom_draw(); +DEVILUTION_END_NAMESPACE + #endif /* __DOOM_H__ */ diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h index 616cb4449..e6b32d1a9 100644 --- a/Source/drlg_l1.h +++ b/Source/drlg_l1.h @@ -6,6 +6,8 @@ #ifndef __DRLG_L1_H__ #define __DRLG_L1_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE L5dungeon[80][80]; extern BYTE L5dflags[DMAXX][DMAXY]; extern BOOL L5setloadflag; @@ -38,4 +40,6 @@ extern const BYTE PWATERIN[]; /* data */ extern BYTE L5ConvTbl[16]; +DEVILUTION_END_NAMESPACE + #endif /* __DRLG_L1_H__ */ diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h index c0a7a0184..56673ba5f 100644 --- a/Source/drlg_l2.h +++ b/Source/drlg_l2.h @@ -6,6 +6,8 @@ #ifndef __DRLG_L2_H__ #define __DRLG_L2_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int nSx1; extern int nSy1; extern int nSx2; @@ -145,4 +147,6 @@ extern BYTE CTRDOOR7[]; extern BYTE CTRDOOR8[]; extern int Patterns[100][10]; +DEVILUTION_END_NAMESPACE + #endif /* __DRLG_L2_H__ */ diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h index a3067300a..b928eec39 100644 --- a/Source/drlg_l3.h +++ b/Source/drlg_l3.h @@ -6,6 +6,8 @@ #ifndef __DRLG_L3_H__ #define __DRLG_L3_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BOOLEAN lavapool; extern int abyssx; extern int lockoutcnt; @@ -61,4 +63,6 @@ extern const BYTE L3XTRA4[4]; extern const BYTE L3XTRA5[4]; extern const BYTE L3ANVIL[244]; +DEVILUTION_END_NAMESPACE + #endif /* __DRLG_L3_H__ */ diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h index 87d0a9028..8e2e22c42 100644 --- a/Source/drlg_l4.h +++ b/Source/drlg_l4.h @@ -6,6 +6,8 @@ #ifndef __DRLG_L4_H__ #define __DRLG_L4_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int diabquad1x; extern int diabquad1y; extern int diabquad2x; @@ -49,4 +51,6 @@ extern const BYTE L4PENTA[52]; extern const BYTE L4PENTA2[52]; extern const BYTE L4BTYPES[140]; +DEVILUTION_END_NAMESPACE + #endif /* __DRLG_L4_H__ */ diff --git a/Source/dthread.h b/Source/dthread.h index 78501ad34..a440644ff 100644 --- a/Source/dthread.h +++ b/Source/dthread.h @@ -6,6 +6,8 @@ #ifndef __DTHREAD_H__ #define __DTHREAD_H__ +DEVILUTION_BEGIN_NAMESPACE + extern SDL_threadID glpDThreadId; extern BOOLEAN dthread_running; @@ -16,5 +18,6 @@ unsigned int dthread_handler(void *data); void dthread_cleanup(); /* data */ +DEVILUTION_END_NAMESPACE #endif /* __DTHREAD_H__ */ diff --git a/Source/dx.h b/Source/dx.h index f6beb4cd8..f153b312d 100644 --- a/Source/dx.h +++ b/Source/dx.h @@ -6,6 +6,8 @@ #ifndef __DX_H__ #define __DX_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE *gpBuffer; extern char gbBackBuf; extern char gbEmulate; @@ -25,5 +27,6 @@ void PaletteGetEntries(DWORD dwNumEntries, SDL_Color *lpEntries); void PaletteSetEntries(DWORD dwCount, SDL_Color *lpEntries); /* data */ +DEVILUTION_END_NAMESPACE #endif /* __DX_H__ */ diff --git a/Source/effects.h b/Source/effects.h index 7fc8d2110..e3e3a3ed7 100644 --- a/Source/effects.h +++ b/Source/effects.h @@ -6,6 +6,8 @@ #ifndef __EFFECTS_H__ #define __EFFECTS_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int sfxdelay; extern int sfxdnum; extern HANDLE sghStream; @@ -37,5 +39,6 @@ void effects_play_sound(char *snd_file); extern const char MonstSndChar[]; /* data */ +DEVILUTION_END_NAMESPACE #endif /* __EFFECTS_H__ */ diff --git a/Source/encrypt.h b/Source/encrypt.h index adf86a765..a5a73de84 100644 --- a/Source/encrypt.h +++ b/Source/encrypt.h @@ -6,6 +6,8 @@ #ifndef __ENCRYPT_H__ #define __ENCRYPT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern DWORD hashtable[5][256]; void Decrypt(DWORD *castBlock, DWORD size, DWORD key); @@ -17,4 +19,6 @@ unsigned int PkwareBufferRead(char *buf, unsigned int *size, void *param); void PkwareBufferWrite(char *buf, unsigned int *size, void *param); void PkwareDecompress(BYTE *pbInBuff, int recv_size, int dwMaxBytes); +DEVILUTION_END_NAMESPACE + #endif /* __ENCRYPT_H__ */ diff --git a/Source/engine.h b/Source/engine.h index 0b58c971e..0d8580193 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -13,6 +13,8 @@ #ifndef __ENGINE_H__ #define __ENGINE_H__ +DEVILUTION_BEGIN_NAMESPACE + //offset 0 //pCelBuff->pFrameTable[0] @@ -98,4 +100,6 @@ void PlayInGameMovie(char *pszMovie); extern const int RndInc; extern const int RndMult; +DEVILUTION_END_NAMESPACE + #endif /* __ENGINE_H__ */ diff --git a/Source/error.h b/Source/error.h index adc7d6bac..6ca804466 100644 --- a/Source/error.h +++ b/Source/error.h @@ -6,6 +6,8 @@ #ifndef __ERROR_H__ #define __ERROR_H__ +DEVILUTION_BEGIN_NAMESPACE + extern char msgtable[MAX_SEND_STR_LEN]; extern DWORD msgdelay; extern char msgflag; @@ -18,4 +20,6 @@ void DrawDiabloMsg(); /* data */ extern char *MsgStrings[]; +DEVILUTION_END_NAMESPACE + #endif /* __ERROR_H__ */ diff --git a/Source/gamemenu.h b/Source/gamemenu.h index 55ca4c409..a03cb9fd5 100644 --- a/Source/gamemenu.h +++ b/Source/gamemenu.h @@ -6,6 +6,8 @@ #ifndef __GAMEMENU_H__ #define __GAMEMENU_H__ +DEVILUTION_BEGIN_NAMESPACE + void gamemenu_on(); void gamemenu_update_single(TMenuItem *pMenuItems); void gamemenu_update_multi(TMenuItem *pMenuItems); @@ -35,4 +37,6 @@ extern char *music_toggle_names[]; extern char *sound_toggle_names[]; extern char *color_cycling_toggle_names[]; +DEVILUTION_END_NAMESPACE + #endif /* __GAMEMENU_H__ */ diff --git a/Source/gendung.h b/Source/gendung.h index 9dd6b43be..ab6727b0e 100644 --- a/Source/gendung.h +++ b/Source/gendung.h @@ -6,6 +6,8 @@ #ifndef __GENDUNG_H__ #define __GENDUNG_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE dungeon[DMAXX][DMAXY]; extern BYTE pdungeon[DMAXX][DMAXY]; extern char dflags[DMAXX][DMAXY]; @@ -89,4 +91,6 @@ void DRLG_HoldThemeRooms(); BOOL SkipThemeRoom(int x, int y); void InitLevels(); +DEVILUTION_END_NAMESPACE + #endif /* __GENDUNG_H__ */ diff --git a/Source/gmenu.h b/Source/gmenu.h index 2f028b214..c2549c6f5 100644 --- a/Source/gmenu.h +++ b/Source/gmenu.h @@ -6,6 +6,8 @@ #ifndef __GMENU_H__ #define __GMENU_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE *optbar_cel; extern BOOLEAN mouseNavigation; extern BYTE *PentSpin_cel; @@ -43,4 +45,6 @@ void gmenu_slider_steps(TMenuItem *pItem, int dwTicks); extern const BYTE lfontframe[]; extern const BYTE lfontkern[]; +DEVILUTION_END_NAMESPACE + #endif /* __GMENU_H__ */ diff --git a/Source/help.h b/Source/help.h index 52fb3bf36..61a0c4312 100644 --- a/Source/help.h +++ b/Source/help.h @@ -6,6 +6,8 @@ #ifndef __HELP_H__ #define __HELP_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int help_select_line; extern int dword_634494; extern BOOL helpflag; @@ -22,4 +24,6 @@ void HelpScrollDown(); /* rdata */ extern const char gszHelpText[]; +DEVILUTION_END_NAMESPACE + #endif /* __HELP_H__ */ diff --git a/Source/init.h b/Source/init.h index 1955fe51d..eadfb69ef 100644 --- a/Source/init.h +++ b/Source/init.h @@ -6,6 +6,8 @@ #ifndef __INIT_H__ #define __INIT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern _SNETVERSIONDATA fileinfo; extern int gbActive; extern char diablo_exe_path[MAX_PATH]; @@ -36,4 +38,6 @@ extern BOOL was_window_init; /** defined in dx.cpp */ extern char gszVersionNumber[MAX_PATH]; extern char gszProductName[MAX_PATH]; +DEVILUTION_END_NAMESPACE + #endif /* __INIT_H__ */ diff --git a/Source/interfac.h b/Source/interfac.h index a88a864ea..b47ac443c 100644 --- a/Source/interfac.h +++ b/Source/interfac.h @@ -6,6 +6,8 @@ #ifndef __INTERFAC_H__ #define __INTERFAC_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int progress_id; void interface_msg_pump(); @@ -21,4 +23,6 @@ void InitCutscene(unsigned int uMsg); extern const BYTE BarColor[3]; extern const int BarPos[3][2]; +DEVILUTION_END_NAMESPACE + #endif /* __INTERFAC_H__ */ diff --git a/Source/inv.h b/Source/inv.h index 672d452b0..3feb1bd14 100644 --- a/Source/inv.h +++ b/Source/inv.h @@ -6,6 +6,8 @@ #ifndef __INV_H__ #define __INV_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BOOL invflag; extern BOOL drawsbarflag; extern const InvXY InvRect[73]; @@ -55,4 +57,6 @@ BOOL DropItemBeforeTrig(); extern int AP2x2Tbl[10]; +DEVILUTION_END_NAMESPACE + #endif /* __INV_H__ */ diff --git a/Source/itemdat.h b/Source/itemdat.h index 7d038985d..8ac826e39 100644 --- a/Source/itemdat.h +++ b/Source/itemdat.h @@ -6,9 +6,13 @@ #ifndef __ITEMDAT_H__ #define __ITEMDAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern ItemDataStruct AllItemsList[]; extern const PLStruct PL_Prefix[]; extern const PLStruct PL_Suffix[]; extern const UItemStruct UniqueItemList[]; +DEVILUTION_END_NAMESPACE + #endif /* __ITEMDAT_H__ */ diff --git a/Source/items.h b/Source/items.h index 274560154..bacb74111 100644 --- a/Source/items.h +++ b/Source/items.h @@ -6,6 +6,8 @@ #ifndef __ITEMS_H__ #define __ITEMS_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int itemactive[MAXITEMS]; extern BOOL uitemflag; extern int itemavail[MAXITEMS]; @@ -140,4 +142,6 @@ extern int ItemInvSnds[]; extern int idoppely; extern int premiumlvladd[6]; +DEVILUTION_END_NAMESPACE + #endif /* __ITEMS_H__ */ diff --git a/Source/lighting.h b/Source/lighting.h index 49fee6928..4ee959290 100644 --- a/Source/lighting.h +++ b/Source/lighting.h @@ -6,6 +6,8 @@ #ifndef __LIGHTING_H__ #define __LIGHTING_H__ +DEVILUTION_BEGIN_NAMESPACE + extern LightListStruct VisionList[MAXVISION]; extern BYTE lightactive[MAXLIGHTS]; extern LightListStruct LightList[MAXLIGHTS]; @@ -56,4 +58,6 @@ extern BYTE vCrawlTable[23][30]; extern BYTE byte_49463C[18][18]; extern BYTE RadiusAdj[23]; +DEVILUTION_END_NAMESPACE + #endif /* __LIGHTING_H__ */ diff --git a/Source/loadsave.h b/Source/loadsave.h index c8d3f0db1..7c03e8c4d 100644 --- a/Source/loadsave.h +++ b/Source/loadsave.h @@ -6,6 +6,8 @@ #ifndef __LOADSAVE_H__ #define __LOADSAVE_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE *tbuff; void LoadGame(BOOL firstflag); @@ -45,4 +47,6 @@ void SavePortal(int i); void SaveLevel(); void LoadLevel(); +DEVILUTION_END_NAMESPACE + #endif /* __LOADSAVE_H__ */ diff --git a/Source/mainmenu.h b/Source/mainmenu.h index b2b10770b..995d174ba 100644 --- a/Source/mainmenu.h +++ b/Source/mainmenu.h @@ -6,6 +6,8 @@ #ifndef __MAINMENU_H__ #define __MAINMENU_H__ +DEVILUTION_BEGIN_NAMESPACE + extern char gszHero[16]; void mainmenu_refresh_music(); @@ -31,4 +33,6 @@ void mainmenu_play_intro(); extern int menu_music_track_id; +DEVILUTION_END_NAMESPACE + #endif /* __MAINMENU_H__ */ diff --git a/Source/minitext.h b/Source/minitext.h index 27b740e5c..3749005c6 100644 --- a/Source/minitext.h +++ b/Source/minitext.h @@ -6,6 +6,8 @@ #ifndef __MINITEXT_H__ #define __MINITEXT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int qtexty; extern char *qtextptr; extern BOOLEAN qtextflag; @@ -28,4 +30,6 @@ extern const BYTE mfontkern[56]; extern int qscroll_spd_tbl[9]; +DEVILUTION_END_NAMESPACE + #endif /* __MINITEXT_H__ */ diff --git a/Source/misdat.h b/Source/misdat.h index bab38abd1..6de69171f 100644 --- a/Source/misdat.h +++ b/Source/misdat.h @@ -6,7 +6,11 @@ #ifndef __MISDAT_H__ #define __MISDAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern MissileData missiledata[]; extern MisFileData misfiledata[]; +DEVILUTION_END_NAMESPACE + #endif /* __MISDAT_H__ */ diff --git a/Source/missiles.h b/Source/missiles.h index ddd67ec96..dfbfe2abc 100644 --- a/Source/missiles.h +++ b/Source/missiles.h @@ -6,6 +6,8 @@ #ifndef __MISSILES_H__ #define __MISSILES_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int missileactive[MAXMISSILES]; extern int missileavail[MAXMISSILES]; extern MissileStruct missile[MAXMISSILES]; @@ -155,4 +157,6 @@ void ClearMissileSpot(int mi); extern int XDirAdd[8]; extern int YDirAdd[8]; +DEVILUTION_END_NAMESPACE + #endif /* __MISSILES_H__ */ diff --git a/Source/monstdat.h b/Source/monstdat.h index 28de9975f..491654d60 100644 --- a/Source/monstdat.h +++ b/Source/monstdat.h @@ -6,9 +6,13 @@ #ifndef __MONSTDAT_H__ #define __MONSTDAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern MonsterData monsterdata[]; extern BYTE MonstConvTbl[]; extern BYTE MonstAvailTbl[]; extern UniqMonstStruct UniqMonst[]; +DEVILUTION_END_NAMESPACE + #endif /* __MONSTDAT_H__ */ diff --git a/Source/monster.h b/Source/monster.h index d0eaa3683..fb544292b 100644 --- a/Source/monster.h +++ b/Source/monster.h @@ -6,6 +6,8 @@ #ifndef __MONSTER_H__ #define __MONSTER_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int MissileFileFlag; extern int monstkills[MAXMONSTERS]; extern int monstactive[MAXMONSTERS]; @@ -189,4 +191,6 @@ extern int rnd60[4]; extern void (*AiProc[])(int i); +DEVILUTION_END_NAMESPACE + #endif /* __MONSTER_H__ */ diff --git a/Source/movie.h b/Source/movie.h index e8b70a4fa..bcd88798f 100644 --- a/Source/movie.h +++ b/Source/movie.h @@ -6,6 +6,8 @@ #ifndef __MOVIE_H__ #define __MOVIE_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE movie_playing; extern BOOL loop_movie; @@ -14,4 +16,6 @@ LRESULT MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); /* rdata */ +DEVILUTION_END_NAMESPACE + #endif /* __MOVIE_H__ */ diff --git a/Source/mpqapi.h b/Source/mpqapi.h index de809b7f9..2d420181f 100644 --- a/Source/mpqapi.h +++ b/Source/mpqapi.h @@ -7,6 +7,9 @@ #define __MPQAPI_H__ #include + +DEVILUTION_BEGIN_NAMESPACE + extern BYTE mpq_buf[4096]; extern BOOL save_archive_modified; extern BOOLEAN save_archive_open; @@ -28,5 +31,6 @@ BOOL mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, DWORD dwChar); /* rdata */ /* data */ +DEVILUTION_END_NAMESPACE #endif /* __MPQAPI_H__ */ diff --git a/Source/msg.h b/Source/msg.h index 8dfeb7690..deab58434 100644 --- a/Source/msg.h +++ b/Source/msg.h @@ -6,6 +6,8 @@ #ifndef __MSG_H__ #define __MSG_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BOOL deltaload; extern BYTE gbBufferMsgs; extern int dwRecCount; @@ -146,4 +148,6 @@ DWORD On_NOVA(TCmd *pCmd, int pnum); DWORD On_SETSHIELD(TCmd *pCmd, int pnum); DWORD On_REMSHIELD(TCmd *pCmd, int pnum); +DEVILUTION_END_NAMESPACE + #endif /* __MSG_H__ */ diff --git a/Source/multi.h b/Source/multi.h index fbef671eb..4d47fb018 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -6,6 +6,8 @@ #ifndef __MULTI_H__ #define __MULTI_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BOOLEAN gbSomebodyWonGameKludge; extern char szPlayerDescript[128]; extern WORD sgwPackPlrOffsetTbl[MAX_PLRS]; @@ -60,4 +62,6 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, BOOL recv); extern const int event_types[3]; +DEVILUTION_END_NAMESPACE + #endif /* __MULTI_H__ */ diff --git a/Source/nthread.h b/Source/nthread.h index 34e4600d8..367b86561 100644 --- a/Source/nthread.h +++ b/Source/nthread.h @@ -6,6 +6,8 @@ #ifndef __NTHREAD_H__ #define __NTHREAD_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BYTE sgbNetUpdateRate; extern DWORD gdwMsgLenTbl[MAX_PLRS]; extern DWORD gdwDeltaBytesSec; @@ -30,5 +32,6 @@ void nthread_ignore_mutex(BOOL bStart); BOOL nthread_has_500ms_passed(BOOL unused); /* rdata */ +DEVILUTION_END_NAMESPACE #endif /* __NTHREAD_H__ */ diff --git a/Source/objdat.h b/Source/objdat.h index 29c33bc19..5fed8a71b 100644 --- a/Source/objdat.h +++ b/Source/objdat.h @@ -2,8 +2,12 @@ #ifndef __OBJDAT_H__ #define __OBJDAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int ObjTypeConv[]; extern ObjDataStruct AllObjects[99]; extern char *ObjMasterLoadList[56]; +DEVILUTION_END_NAMESPACE + #endif /* __OBJDAT_H__ */ diff --git a/Source/objects.h b/Source/objects.h index 8dc5059d2..528c4b65a 100644 --- a/Source/objects.h +++ b/Source/objects.h @@ -2,6 +2,8 @@ #ifndef __OBJECTS_H__ #define __OBJECTS_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int trapid; extern int trapdir; extern BYTE *pObjCels[40]; @@ -163,4 +165,6 @@ extern BYTE shrineavail[NUM_SHRINETYPE]; extern char *StoryBookName[9]; extern int StoryText[3][3]; +DEVILUTION_END_NAMESPACE + #endif /* __OBJECTS_H__ */ diff --git a/Source/pack.h b/Source/pack.h index 5b7b6f6f1..16c8447a0 100644 --- a/Source/pack.h +++ b/Source/pack.h @@ -2,10 +2,13 @@ #ifndef __PACK_H__ #define __PACK_H__ +DEVILUTION_BEGIN_NAMESPACE + void PackPlayer(PkPlayerStruct *pPack, int pnum, BOOL manashield); void VerifyGoldSeeds(PlayerStruct *pPlayer); void UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOL killok); /* rdata */ +DEVILUTION_END_NAMESPACE #endif /* __PACK_H__ */ diff --git a/Source/palette.h b/Source/palette.h index 8d07c1df4..b47a2de0d 100644 --- a/Source/palette.h +++ b/Source/palette.h @@ -2,6 +2,8 @@ #ifndef __PALETTE_H__ #define __PALETTE_H__ +DEVILUTION_BEGIN_NAMESPACE + extern SDL_Color logical_palette[256]; extern SDL_Color system_palette[256]; extern SDL_Color orig_palette[256]; @@ -32,4 +34,6 @@ BOOL palette_set_color_cycling(BOOL enabled); extern int gamma_correction; extern BOOL color_cycling_enabled; +DEVILUTION_END_NAMESPACE + #endif /* __PALETTE_H__ */ diff --git a/Source/path.h b/Source/path.h index 83191d34f..0a9baf17e 100644 --- a/Source/path.h +++ b/Source/path.h @@ -6,6 +6,8 @@ #ifndef __PATH_H__ #define __PATH_H__ +DEVILUTION_BEGIN_NAMESPACE + extern PATHNODE path_nodes[MAXPATHNODES]; extern int gdwCurPathStep; extern int gdwCurNodes; @@ -38,4 +40,6 @@ extern const char pathydir[8]; /* data */ extern char path_directions[9]; +DEVILUTION_END_NAMESPACE + #endif /* __PATH_H__ */ diff --git a/Source/pfile.h b/Source/pfile.h index d47dc518b..b8dde2c72 100644 --- a/Source/pfile.h +++ b/Source/pfile.h @@ -2,6 +2,8 @@ #ifndef __PFILE_H__ #define __PFILE_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BOOL gbValidSaveFile; void pfile_init_save_directory(); @@ -42,5 +44,6 @@ BYTE *pfile_read(const char *pszName, DWORD *pdwLen); void pfile_update(BOOL force_save); /* rdata */ +DEVILUTION_END_NAMESPACE #endif /* __PFILE_H__ */ diff --git a/Source/player.h b/Source/player.h index bc6943b7f..f3508d50b 100644 --- a/Source/player.h +++ b/Source/player.h @@ -2,6 +2,8 @@ #ifndef __PLAYER_H__ #define __PLAYER_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int plr_lframe_size; extern int plr_wframe_size; extern BYTE plr_gfx_flag; @@ -135,4 +137,6 @@ extern int ExpLvlsTbl[MAXCHARLEVEL]; extern char *ClassStrTbl[]; extern BYTE fix[9]; +DEVILUTION_END_NAMESPACE + #endif /* __PLAYER_H__ */ diff --git a/Source/plrmsg.h b/Source/plrmsg.h index 0cccbf51f..3f2aa6cfd 100644 --- a/Source/plrmsg.h +++ b/Source/plrmsg.h @@ -2,6 +2,8 @@ #ifndef __PLRMSG_H__ #define __PLRMSG_H__ +DEVILUTION_BEGIN_NAMESPACE + extern _plrmsg plr_msgs[PMSG_COUNT]; void plrmsg_delay(BOOL delay); @@ -17,4 +19,6 @@ void PrintPlrMsg(DWORD x, DWORD y, DWORD width, const char *str, BYTE col); extern const char text_color_from_player_num[MAX_PLRS + 1]; +DEVILUTION_END_NAMESPACE + #endif /* __PLRMSG_H__ */ diff --git a/Source/portal.h b/Source/portal.h index 1690180dc..fa309d22a 100644 --- a/Source/portal.h +++ b/Source/portal.h @@ -2,6 +2,8 @@ #ifndef __PORTAL_H__ #define __PORTAL_H__ +DEVILUTION_BEGIN_NAMESPACE + extern PortalStruct portal[MAXPORTAL]; extern int portalindex; @@ -23,4 +25,6 @@ BOOL PosOkPortal(int lvl, int x, int y); extern int WarpDropX[MAXPORTAL]; extern int WarpDropY[MAXPORTAL]; +DEVILUTION_END_NAMESPACE + #endif /* __PORTAL_H__ */ diff --git a/Source/quests.h b/Source/quests.h index cf52fb578..c21b0b875 100644 --- a/Source/quests.h +++ b/Source/quests.h @@ -2,6 +2,8 @@ #ifndef __QUESTS_H__ #define __QUESTS_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int qtopline; extern BOOL questlog; extern BYTE *pQLogCel; @@ -52,4 +54,6 @@ extern int QuestGroup2[3]; extern int QuestGroup3[3]; extern int QuestGroup4[2]; +DEVILUTION_END_NAMESPACE + #endif /* __QUESTS_H__ */ diff --git a/Source/render.h b/Source/render.h index 0d3f60e9f..5a8fc6f69 100644 --- a/Source/render.h +++ b/Source/render.h @@ -1,8 +1,12 @@ #ifndef __RENDER_H__ #define __RENDER_H__ +DEVILUTION_BEGIN_NAMESPACE + void RenderTile(BYTE *pBuff); void world_draw_black_tile(int sx, int sy); void trans_rect(int sx, int sy, int width, int height); +DEVILUTION_END_NAMESPACE + #endif /* __RENDER_H__ */ diff --git a/Source/restrict.h b/Source/restrict.h index bb1d05567..09e5096d1 100644 --- a/Source/restrict.h +++ b/Source/restrict.h @@ -2,6 +2,10 @@ #ifndef __RESTRICT_H__ #define __RESTRICT_H__ +DEVILUTION_BEGIN_NAMESPACE + void ReadOnlyTest(); +DEVILUTION_END_NAMESPACE + #endif /* __RESTRICT_H__ */ diff --git a/Source/scrollrt.h b/Source/scrollrt.h index 7ceca2adc..8b619ab64 100644 --- a/Source/scrollrt.h +++ b/Source/scrollrt.h @@ -2,6 +2,8 @@ #ifndef __SCROLLRT_H__ #define __SCROLLRT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern bool sgbControllerActive; extern int light_table_index; extern BYTE *gpBufStart; @@ -33,4 +35,6 @@ void DrawAndBlit(); extern char *szMonModeAssert[18]; extern char *szPlrModeAssert[12]; +DEVILUTION_END_NAMESPACE + #endif /* __SCROLLRT_H__ */ diff --git a/Source/setmaps.h b/Source/setmaps.h index e5a3a0338..256e5a4ba 100644 --- a/Source/setmaps.h +++ b/Source/setmaps.h @@ -2,6 +2,8 @@ #ifndef __SETMAPS_H__ #define __SETMAPS_H__ +DEVILUTION_BEGIN_NAMESPACE + int ObjIndex(int x, int y); void AddSKingObjs(); void AddSChamObjs(); @@ -19,4 +21,6 @@ extern BYTE SkelChamTrans2[8]; extern BYTE SkelChamTrans3[36]; extern char *quest_level_names[]; +DEVILUTION_END_NAMESPACE + #endif /* __SETMAPS_H__ */ diff --git a/Source/sha.h b/Source/sha.h index e97f540dd..e940d8e78 100644 --- a/Source/sha.h +++ b/Source/sha.h @@ -2,6 +2,8 @@ #ifndef __SHA_H__ #define __SHA_H__ +DEVILUTION_BEGIN_NAMESPACE + #define SHA1HashSize 20 //sha @@ -14,4 +16,6 @@ void SHA1ProcessMessageBlock(SHA1Context *context); void SHA1Reset(int n); void SHA1Init(SHA1Context *context); +DEVILUTION_END_NAMESPACE + #endif /* __SHA_H__ */ diff --git a/Source/sound.h b/Source/sound.h index 16618e920..10cf37668 100644 --- a/Source/sound.h +++ b/Source/sound.h @@ -2,6 +2,8 @@ #ifndef __SOUND_H__ #define __SOUND_H__ +DEVILUTION_BEGIN_NAMESPACE + extern SoundSample *DSBs[8]; extern BOOLEAN gbSndInited; extern HMODULE hDsound_dll; @@ -35,4 +37,6 @@ extern BOOLEAN gbSoundOn; extern BOOLEAN gbDupSounds; extern char unk_volume[4][2]; +DEVILUTION_END_NAMESPACE + #endif /* __SOUND_H__ */ diff --git a/Source/spelldat.h b/Source/spelldat.h index 2c894f3b9..1db3eb1ec 100644 --- a/Source/spelldat.h +++ b/Source/spelldat.h @@ -2,6 +2,10 @@ #ifndef __SPELLDAT_H__ #define __SPELLDAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern SpellData spelldata[]; +DEVILUTION_END_NAMESPACE + #endif /* __SPELLDAT_H__ */ diff --git a/Source/spells.h b/Source/spells.h index 9eb299e4f..a83b12ca0 100644 --- a/Source/spells.h +++ b/Source/spells.h @@ -2,6 +2,8 @@ #ifndef __SPELLS_H__ #define __SPELLS_H__ +DEVILUTION_BEGIN_NAMESPACE + int GetManaAmount(int id, int sn); void UseMana(int id, int sn); BOOL CheckSpell(int id, int sn, char st, BOOL manaonly); @@ -9,4 +11,6 @@ void CastSpell(int id, int spl, int sx, int sy, int dx, int dy, int caster, int void DoResurrect(int pnum, int rid); void DoHealOther(int pnum, int rid); +DEVILUTION_END_NAMESPACE + #endif /* __SPELLS_H__ */ diff --git a/Source/stores.h b/Source/stores.h index 667158bfe..28e8f8811 100644 --- a/Source/stores.h +++ b/Source/stores.h @@ -2,6 +2,8 @@ #ifndef __STORES_H__ #define __STORES_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int stextup; extern int storenumh; extern int stextlhold; @@ -136,5 +138,6 @@ void ReleaseStoreBtn(); /* rdata */ extern char *talkname[9]; +DEVILUTION_END_NAMESPACE #endif /* __STORES_H__ */ diff --git a/Source/sync.h b/Source/sync.h index b65f9b194..a3e0bd95d 100644 --- a/Source/sync.h +++ b/Source/sync.h @@ -2,6 +2,8 @@ #ifndef __SYNC_H__ #define __SYNC_H__ +DEVILUTION_BEGIN_NAMESPACE + extern WORD sync_word_6AA708[MAXMONSTERS]; extern int sgnMonsters; extern WORD sgwLRU[MAXMONSTERS]; @@ -17,4 +19,6 @@ DWORD sync_update(int pnum, const BYTE *pbBuf); void sync_monster(int pnum, const TSyncMonster *p); void sync_init(); +DEVILUTION_END_NAMESPACE + #endif /* __SYNC_H__ */ diff --git a/Source/textdat.h b/Source/textdat.h index 2edb4f4ad..e31208eb2 100644 --- a/Source/textdat.h +++ b/Source/textdat.h @@ -2,7 +2,10 @@ #ifndef __TEXTDAT_H__ #define __TEXTDAT_H__ +DEVILUTION_BEGIN_NAMESPACE + extern const TextDataStruct alltext[]; extern const DWORD gdwAllTextEntries; +DEVILUTION_END_NAMESPACE #endif /* __TEXTDAT_H__ */ diff --git a/Source/themes.h b/Source/themes.h index 35c4cb083..042d04130 100644 --- a/Source/themes.h +++ b/Source/themes.h @@ -6,6 +6,8 @@ #ifndef __THEMES_H__ #define __THEMES_H__ +DEVILUTION_BEGIN_NAMESPACE + extern int numthemes; extern BOOL armorFlag; extern BOOL ThemeGoodIn[4]; @@ -63,4 +65,5 @@ extern int trm5y[25]; extern int trm3x[9]; extern int trm3y[9]; +DEVILUTION_END_NAMESPACE #endif /* __THEMES_H__ */ diff --git a/Source/tmsg.h b/Source/tmsg.h index 7e23e31e5..aee6936f5 100644 --- a/Source/tmsg.h +++ b/Source/tmsg.h @@ -2,9 +2,12 @@ #ifndef __TMSG_H__ #define __TMSG_H__ +DEVILUTION_BEGIN_NAMESPACE + int tmsg_get(BYTE *pbMsg, DWORD dwMaxLen); void tmsg_add(BYTE *pbMsg, BYTE bLen); void tmsg_start(); void tmsg_cleanup(); +DEVILUTION_END_NAMESPACE #endif /* __TMSG_H__ */ diff --git a/Source/town.h b/Source/town.h index b4025ec24..8898471b3 100644 --- a/Source/town.h +++ b/Source/town.h @@ -2,10 +2,13 @@ #ifndef __TOWN_H__ #define __TOWN_H__ +DEVILUTION_BEGIN_NAMESPACE + void SetTownMicros(); void T_FillSector(BYTE *P3Tiles, BYTE *pSector, int xi, int yi, int w, int h); void T_FillTile(BYTE *P3Tiles, int xx, int yy, int t); void T_Pass3(); void CreateTown(int entry); +DEVILUTION_END_NAMESPACE #endif /* __TOWN_H__ */ diff --git a/Source/towners.h b/Source/towners.h index c02191c25..050c264ee 100644 --- a/Source/towners.h +++ b/Source/towners.h @@ -2,6 +2,8 @@ #ifndef __TOWNERS_H__ #define __TOWNERS_H__ +DEVILUTION_BEGIN_NAMESPACE + extern TownerStruct towner[16]; int GetActiveTowner(int t); @@ -41,5 +43,6 @@ void CowSFX(int pnum); /* data */ extern QuestTalkData Qtalklist[]; +DEVILUTION_END_NAMESPACE #endif /* __TOWNERS_H__ */ diff --git a/Source/track.h b/Source/track.h index a2a2506c9..5bafb7fd2 100644 --- a/Source/track.h +++ b/Source/track.h @@ -2,8 +2,12 @@ #ifndef __TRACK_H__ #define __TRACK_H__ +DEVILUTION_BEGIN_NAMESPACE + void track_process(); void track_repeat_walk(BOOL rep); BOOL track_isscrolling(); +DEVILUTION_END_NAMESPACE + #endif /* __TRACK_H__ */ diff --git a/Source/trigs.h b/Source/trigs.h index fe7243bbd..a51930dbe 100644 --- a/Source/trigs.h +++ b/Source/trigs.h @@ -2,6 +2,8 @@ #ifndef __TRIGS_H__ #define __TRIGS_H__ +DEVILUTION_BEGIN_NAMESPACE + extern BOOL townwarps[3]; extern BOOL trigflag; extern int numtrigs; @@ -47,4 +49,5 @@ extern int L4DownList[6]; extern int L4TWarpUpList[4]; extern int L4PentaList[33]; +DEVILUTION_END_NAMESPACE #endif /* __TRIGS_H__ */ diff --git a/Source/wave.h b/Source/wave.h index 1830b95b0..1805e2637 100644 --- a/Source/wave.h +++ b/Source/wave.h @@ -2,6 +2,8 @@ #ifndef __WAVE_H__ #define __WAVE_H__ +DEVILUTION_BEGIN_NAMESPACE + void WCloseFile(HANDLE file); LONG WGetFileSize(HANDLE hsFile, DWORD *lpFileSizeHigh, const char *FileName); void WGetFileArchive(HANDLE hsFile, DWORD *retry, const char *FileName); @@ -9,4 +11,6 @@ BOOL WOpenFile(const char *FileName, HANDLE *phsFile, BOOL mayNotExist); void WReadFile(HANDLE hsFile, LPVOID buf, DWORD to_read, const char *FileName); int WSetFilePointer(HANDLE file1, int offset, HANDLE file2, int whence); +DEVILUTION_END_NAMESPACE + #endif /* __WAVE_H__ */ diff --git a/enums.h b/enums.h index 7ee99c270..c400de1fc 100644 --- a/enums.h +++ b/enums.h @@ -4,6 +4,8 @@ * Various global enumerators. */ +DEVILUTION_BEGIN_NAMESPACE + typedef enum item_quality { ITEM_QUALITY_NORMAL = 0, ITEM_QUALITY_MAGIC = 1, @@ -2940,3 +2942,5 @@ typedef enum conn_type { #endif SELCONN_LOOPBACK, } conn_type; + +DEVILUTION_END_NAMESPACE diff --git a/structs.h b/structs.h index fe87ff40e..566172af5 100644 --- a/structs.h +++ b/structs.h @@ -4,6 +4,8 @@ * Various global structures. */ +DEVILUTION_BEGIN_NAMESPACE + ////////////////////////////////////////////////// // control ////////////////////////////////////////////////// @@ -1585,3 +1587,5 @@ typedef struct TDataInfo { DWORD destOffset; DWORD size; } TDataInfo; + +DEVILUTION_END_NAMESPACE diff --git a/types.h b/types.h index d3e377cc1..a351faf37 100644 --- a/types.h +++ b/types.h @@ -14,8 +14,6 @@ #include "thread.h" #include "ui_fwd.h" -DEVILUTION_BEGIN_NAMESPACE - #include #include "defs.h" #include "enums.h"