Browse Source

🎨 Change namespace to devilution

pull/1393/head
Anders Jenbo 5 years ago
parent
commit
bfb3c11c2b
  1. 2
      3rdParty/Storm/Source/storm.h
  2. 2
      DiabloUI/diabloui.h
  3. 6
      Source/appfat.cpp
  4. 2
      Source/appfat.h
  5. 6
      Source/automap.cpp
  6. 2
      Source/automap.h
  7. 4
      Source/capture.cpp
  8. 2
      Source/capture.h
  9. 4
      Source/codec.cpp
  10. 2
      Source/codec.h
  11. 4
      Source/control.cpp
  12. 2
      Source/control.h
  13. 4
      Source/cursor.cpp
  14. 2
      Source/cursor.h
  15. 4
      Source/dead.cpp
  16. 2
      Source/dead.h
  17. 4
      Source/debug.cpp
  18. 2
      Source/debug.h
  19. 4
      Source/diablo.cpp
  20. 2
      Source/diablo.h
  21. 4
      Source/doom.cpp
  22. 2
      Source/doom.h
  23. 4
      Source/drlg_l1.cpp
  24. 2
      Source/drlg_l1.h
  25. 4
      Source/drlg_l2.cpp
  26. 2
      Source/drlg_l2.h
  27. 4
      Source/drlg_l3.cpp
  28. 2
      Source/drlg_l3.h
  29. 4
      Source/drlg_l4.cpp
  30. 2
      Source/drlg_l4.h
  31. 4
      Source/dthread.cpp
  32. 2
      Source/dthread.h
  33. 2
      Source/dx.h
  34. 4
      Source/effects.cpp
  35. 2
      Source/effects.h
  36. 4
      Source/encrypt.cpp
  37. 2
      Source/encrypt.h
  38. 4
      Source/engine.cpp
  39. 2
      Source/engine.h
  40. 4
      Source/error.cpp
  41. 2
      Source/error.h
  42. 4
      Source/gamemenu.cpp
  43. 2
      Source/gamemenu.h
  44. 4
      Source/gendung.cpp
  45. 2
      Source/gendung.h
  46. 4
      Source/gmenu.cpp
  47. 2
      Source/gmenu.h
  48. 4
      Source/help.cpp
  49. 2
      Source/help.h
  50. 4
      Source/init.cpp
  51. 2
      Source/init.h
  52. 4
      Source/interfac.cpp
  53. 2
      Source/interfac.h
  54. 4
      Source/inv.cpp
  55. 2
      Source/inv.h
  56. 4
      Source/itemdat.cpp
  57. 2
      Source/itemdat.h
  58. 4
      Source/items.cpp
  59. 2
      Source/items.h
  60. 4
      Source/lighting.cpp
  61. 2
      Source/lighting.h
  62. 6
      Source/loadsave.cpp
  63. 2
      Source/loadsave.h
  64. 4
      Source/mainmenu.cpp
  65. 2
      Source/mainmenu.h
  66. 4
      Source/minitext.cpp
  67. 2
      Source/minitext.h
  68. 4
      Source/misdat.cpp
  69. 2
      Source/misdat.h
  70. 4
      Source/missiles.cpp
  71. 2
      Source/missiles.h
  72. 4
      Source/monstdat.cpp
  73. 2
      Source/monstdat.h
  74. 4
      Source/monster.cpp
  75. 2
      Source/monster.h
  76. 4
      Source/movie.cpp
  77. 2
      Source/movie.h
  78. 4
      Source/mpqapi.cpp
  79. 2
      Source/mpqapi.h
  80. 4
      Source/msg.cpp
  81. 2
      Source/msg.h
  82. 4
      Source/multi.cpp
  83. 2
      Source/multi.h
  84. 4
      Source/nthread.cpp
  85. 2
      Source/nthread.h
  86. 4
      Source/objdat.cpp
  87. 2
      Source/objdat.h
  88. 4
      Source/objects.cpp
  89. 2
      Source/objects.h
  90. 2
      Source/options.h
  91. 4
      Source/pack.cpp
  92. 2
      Source/pack.h
  93. 4
      Source/palette.cpp
  94. 2
      Source/palette.h
  95. 4
      Source/path.cpp
  96. 2
      Source/path.h
  97. 4
      Source/pfile.cpp
  98. 2
      Source/pfile.h
  99. 4
      Source/player.cpp
  100. 2
      Source/player.h
  101. Some files were not shown because too many files have changed in this diff Show More

2
3rdParty/Storm/Source/storm.h vendored

@ -3,7 +3,7 @@
#include <cstdint>
#include <limits>
#include <string>
namespace dvl {
namespace devilution {
typedef struct PCXHeader {
Uint8 Manufacturer;

2
DiabloUI/diabloui.h

@ -2,7 +2,7 @@
#ifndef __DIABLOUI_H__
#define __DIABLOUI_H__
namespace dvl {
namespace devilution {
typedef struct _uidefaultstats {
Uint16 strength;

6
Source/appfat.cpp

@ -7,7 +7,7 @@
#include "../3rdParty/Storm/Source/storm.h"
#include <config.h>
namespace dvl {
namespace devilution {
namespace {
@ -49,7 +49,7 @@ void FreeDlg()
SNetDestroy();
}
}
} // namespace
/**
* @brief Terminates the game and displays an error message box.
@ -173,4 +173,4 @@ void DirErrorDlg(const char *error)
app_fatal(NULL);
}
}
} // namespace devilution

2
Source/appfat.h

@ -7,7 +7,7 @@
#include <SDL.h>
namespace dvl {
namespace devilution {
[[noreturn]] void app_fatal(const char *pszFmt, ...);
void DrawDlg(const char *pszFmt, ...);

6
Source/automap.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
namespace {
/**
@ -453,7 +453,7 @@ void DrawAutomapText(CelOutputBuffer out)
}
}
}
} // namespace
bool automapflag;
bool automapview[DMAXX][DMAXY];
@ -764,4 +764,4 @@ void AutomapZoomReset()
AmLine4 = AmLine8 >> 1;
}
}
} // namespace devilution

2
Source/automap.h

@ -8,7 +8,7 @@
#include "engine.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/capture.cpp

@ -10,7 +10,7 @@
#include "paths.h"
#include "file_util.h"
namespace dvl {
namespace devilution {
/**
* @brief Write the PCX-file header
@ -205,4 +205,4 @@ void CaptureScreen()
delete out_stream;
}
}
} // namespace devilution

2
Source/capture.h

@ -6,7 +6,7 @@
#ifndef __CAPTURE_H__
#define __CAPTURE_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/codec.cpp

@ -8,7 +8,7 @@
#include <cstddef>
#include <cstdint>
namespace dvl {
namespace devilution {
typedef struct CodecSignature {
DWORD checksum;
@ -142,4 +142,4 @@ void codec_encode(BYTE *pbSrcDst, DWORD size, int size_64, const char *pszPasswo
SHA1Clear();
}
}
} // namespace devilution

2
Source/codec.h

@ -6,7 +6,7 @@
#ifndef __CODEC_H__
#define __CODEC_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/control.cpp

@ -7,7 +7,7 @@
#include <cstddef>
namespace dvl {
namespace devilution {
namespace {
@ -2311,4 +2311,4 @@ BOOL control_presskeys(int vkey)
return ret;
}
}
} // namespace devilution

2
Source/control.h

@ -9,7 +9,7 @@
#include "engine.h"
#include "spelldat.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/cursor.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Pixel width of the current cursor image */
int cursW;
@ -661,4 +661,4 @@ void CheckCursMove()
}
}
}
} // namespace devilution

2
Source/cursor.h

@ -6,7 +6,7 @@
#ifndef __CURSOR_H__
#define __CURSOR_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/dead.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
DeadStruct dead[MAXDEAD];
int stonendx;
@ -91,4 +91,4 @@ void SetDead()
}
}
}
} // namespace devilution

2
Source/dead.h

@ -6,7 +6,7 @@
#ifndef __DEAD_H__
#define __DEAD_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/debug.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
#ifdef _DEBUG
BOOL update_seed_check = FALSE;
@ -224,4 +224,4 @@ void NextDebugMonster()
}
#endif
}
} // namespace devilution

2
Source/debug.h

@ -6,7 +6,7 @@
#ifndef __DEBUG_H__
#define __DEBUG_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/diablo.cpp

@ -11,7 +11,7 @@
#include "../DiabloUI/diabloui.h"
#include <config.h>
namespace dvl {
namespace devilution {
SDL_Window *ghMainWnd;
DWORD glSeedTbl[NUMLEVELS];
@ -2094,4 +2094,4 @@ void diablo_color_cyc_logic()
}
}
}
} // namespace devilution

2
Source/diablo.h

@ -11,7 +11,7 @@
#include "monstdat.h"
#endif
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/doom.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
int doom_quest_time;
int doom_stars_drawn;
@ -95,4 +95,4 @@ void doom_draw(CelOutputBuffer out)
CelDrawTo(out, PANEL_X, PANEL_Y - 1, pDoomCel, 1, 640);
}
}
} // namespace devilution

2
Source/doom.h

@ -8,7 +8,7 @@
#include "engine.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/drlg_l1.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
int UberRow;
int UberCol;
@ -2904,4 +2904,4 @@ void drlg_l1_crypt_pattern7(int rndper)
drlg_l1_crypt_rndset(byte_48A1DC, rndper);
}
}
} // namespace devilution

2
Source/drlg_l1.h

@ -6,7 +6,7 @@
#ifndef __DRLG_L1_H__
#define __DRLG_L1_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/drlg_l2.cpp

@ -8,7 +8,7 @@
#include "all.h"
namespace dvl {
namespace devilution {
BYTE predungeon[DMAXX][DMAXY];
@ -3471,4 +3471,4 @@ void CreateL2Dungeon(DWORD rseed, int entry)
DRLG_SetPC();
}
}
} // namespace devilution

2
Source/drlg_l2.h

@ -6,7 +6,7 @@
#ifndef __DRLG_L2_H__
#define __DRLG_L2_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/drlg_l3.cpp

@ -8,7 +8,7 @@
#include "all.h"
namespace dvl {
namespace devilution {
namespace {
@ -2756,4 +2756,4 @@ void LoadPreL3Dungeon(const char *sFileName, int vx, int vy)
mem_free_dbg(pLevelMap);
}
}
} // namespace devilution

2
Source/drlg_l3.h

@ -6,7 +6,7 @@
#ifndef __DRLG_L3_H__
#define __DRLG_L3_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/drlg_l4.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
int diabquad1x;
int diabquad1y;
@ -1891,4 +1891,4 @@ void LoadPreL4Dungeon(char *sFileName, int vx, int vy)
mem_free_dbg(pLevelMap);
}
}
} // namespace devilution

2
Source/drlg_l4.h

@ -6,7 +6,7 @@
#ifndef __DRLG_L4_H__
#define __DRLG_L4_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/dthread.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "../3rdParty/Storm/Source/storm.h"
namespace dvl {
namespace devilution {
static CCritSect sgMemCrit;
SDL_threadID glpDThreadId;
@ -140,4 +140,4 @@ void dthread_cleanup()
}
}
}
} // namespace devilution

2
Source/dthread.h

@ -6,7 +6,7 @@
#ifndef __DTHREAD_H__
#define __DTHREAD_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

2
Source/dx.h

@ -6,7 +6,7 @@
#ifndef __DX_H__
#define __DX_H__
namespace dvl {
namespace devilution {
CelOutputBuffer GlobalBackBuffer();

4
Source/effects.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include <SDL_mixer.h>
namespace dvl {
namespace devilution {
int sfxdelay;
int sfxdnum;
@ -1420,4 +1420,4 @@ int GetSFXLength(int nSFX)
return sgSFX[nSFX].pSnd->DSB->GetLength();
}
}
} // namespace devilution

2
Source/effects.h

@ -8,7 +8,7 @@
#include "sound.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/encrypt.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "../3rdParty/PKWare/pkware.h"
namespace dvl {
namespace devilution {
DWORD hashtable[5][256];
@ -161,4 +161,4 @@ void PkwareDecompress(BYTE *pbInBuff, int recv_size, int dwMaxBytes)
mem_free_dbg(pbOutBuff);
}
}
} // namespace devilution

2
Source/encrypt.h

@ -6,7 +6,7 @@
#ifndef __ENCRYPT_H__
#define __ENCRYPT_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/engine.cpp

@ -14,7 +14,7 @@
#include "options.h"
#include "../3rdParty/Storm/Source/storm.h"
namespace dvl {
namespace devilution {
/** Seed value before the most recent call to SetRndSeed() */
Sint32 orgseed;
@ -1084,4 +1084,4 @@ void PlayInGameMovie(const char *pszMovie)
force_redraw = 255;
}
}
} // namespace devilution

2
Source/engine.h

@ -25,7 +25,7 @@
#include "../types.h"
namespace dvl {
namespace devilution {
// `malloc` that returns a user-friendly error on OOM.
//

4
Source/error.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
char msgtable[MAX_SEND_STR_LEN];
DWORD msgdelay;
@ -162,4 +162,4 @@ void DrawDiabloMsg(CelOutputBuffer out)
}
}
}
} // namespace devilution

2
Source/error.h

@ -8,7 +8,7 @@
#include "engine.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/gamemenu.cpp

@ -7,7 +7,7 @@
#include "all.h"
#include "options.h"
namespace dvl {
namespace devilution {
bool gbRunInTown = false;
@ -396,4 +396,4 @@ void gamemenu_color_cycling(BOOL bActivate)
sgOptionsMenu[3].pszStr = color_cycling_toggle_names[sgOptions.Graphics.bColorCycling ? 1 : 0];
}
}
} // namespace devilution

2
Source/gamemenu.h

@ -6,7 +6,7 @@
#ifndef __GAMEMENU_H__
#define __GAMEMENU_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/gendung.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "options.h"
namespace dvl {
namespace devilution {
/** Contains the tile IDs of the map. */
BYTE dungeon[DMAXX][DMAXY];
@ -604,4 +604,4 @@ void InitLevels()
setlevel = FALSE;
}
}
} // namespace devilution

2
Source/gendung.h

@ -6,7 +6,7 @@
#ifndef __GENDUNG_H__
#define __GENDUNG_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/gmenu.cpp

@ -8,7 +8,7 @@
#include "../SourceX/controls/axis_direction.h"
#include "../SourceX/controls/controller_motion.h"
namespace dvl {
namespace devilution {
BYTE *optbar_cel;
BOOLEAN mouseNavigation;
@ -436,4 +436,4 @@ void gmenu_slider_steps(TMenuItem *pItem, int steps)
pItem->dwFlags |= (steps << 12) & 0xFFF000;
}
}
} // namespace devilution

2
Source/gmenu.h

@ -8,7 +8,7 @@
#include "engine.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/help.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
int help_select_line;
BOOL helpflag;
@ -586,4 +586,4 @@ void HelpScrollDown()
help_select_line++;
}
}
} // namespace devilution

2
Source/help.h

@ -6,7 +6,7 @@
#ifndef __HELP_H__
#define __HELP_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/init.cpp

@ -18,7 +18,7 @@
int _newlib_heap_size_user = 100 * 1024 * 1024;
#endif
namespace dvl {
namespace devilution {
/** True if the game is the current active window */
int gbActive;
@ -231,4 +231,4 @@ WNDPROC SetWindowProc(WNDPROC NewProc)
return OldProc;
}
}
} // namespace devilution

2
Source/init.h

@ -6,7 +6,7 @@
#ifndef __INIT_H__
#define __INIT_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/interfac.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "../SourceX/DiabloUI/art_draw.h"
namespace dvl {
namespace devilution {
BYTE *sgpBackCel;
Uint32 sgdwProgress;
@ -387,4 +387,4 @@ void ShowProgress(interface_mode uMsg)
gbSomebodyWonGameKludge = FALSE;
}
}
} // namespace devilution

2
Source/interfac.h

@ -6,7 +6,7 @@
#ifndef __INTERFAC_H__
#define __INTERFAC_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/inv.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "options.h"
namespace dvl {
namespace devilution {
BOOL invflag;
BYTE *pInvCels;
@ -2871,4 +2871,4 @@ BOOL DropItemBeforeTrig()
return FALSE;
}
}
} // namespace devilution

2
Source/inv.h

@ -9,7 +9,7 @@
#include "items.h"
#include "player.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/itemdat.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Contains the data related to each item ID. */
ItemDataStruct AllItemsList[] = {
@ -500,4 +500,4 @@ const UItemStruct UniqueItemList[] = {
// clang-format on
};
}
} // namespace devilution

2
Source/itemdat.h

@ -6,7 +6,7 @@
#ifndef __ITEMDAT_H__
#define __ITEMDAT_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/items.cpp

@ -7,7 +7,7 @@
#include "all.h"
#include "options.h"
namespace dvl {
namespace devilution {
int itemactive[MAXITEMS];
BOOL uitemflag;
@ -5472,4 +5472,4 @@ void PutItemRecord(int nSeed, WORD wCI, int nIndex)
}
}
}
} // namespace devilution

2
Source/items.h

@ -8,7 +8,7 @@
#include "itemdat.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/lighting.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
LightListStruct VisionList[MAXVISION];
BYTE lightactive[MAXLIGHTS];
@ -1297,4 +1297,4 @@ void lighting_color_cycling()
}
}
}
} // namespace devilution

2
Source/lighting.h

@ -6,7 +6,7 @@
#ifndef __LIGHTING_H__
#define __LIGHTING_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

6
Source/loadsave.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
bool gbIsHellfireSaveGame;
int giNumberOfLevels;
@ -181,7 +181,7 @@ public:
}
};
}
} // namespace
void RemoveInvalidItem(ItemStruct *pItem)
{
@ -2090,4 +2090,4 @@ void LoadLevel()
}
}
}
} // namespace devilution

2
Source/loadsave.h

@ -8,7 +8,7 @@
#include "player.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/mainmenu.cpp

@ -8,7 +8,7 @@
#include "../3rdParty/Storm/Source/storm.h"
#include "../DiabloUI/diabloui.h"
namespace dvl {
namespace devilution {
char gszHero[16];
@ -156,4 +156,4 @@ void mainmenu_loop()
music_stop();
}
}
} // namespace devilution

2
Source/mainmenu.h

@ -8,7 +8,7 @@
#include "multi.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/minitext.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Specify if the quest dialog window is being shown */
bool qtextflag;
@ -260,4 +260,4 @@ void DrawQText(CelOutputBuffer out)
DrawQTextContent(out);
}
}
} // namespace devilution

2
Source/minitext.h

@ -6,7 +6,7 @@
#ifndef __MINITEXT_H__
#define __MINITEXT_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/misdat.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Data related to each missile ID. */
MissileData missiledata[] = {
@ -189,4 +189,4 @@ MisFileData misfiledata[] = {
// clang-format on
};
}
} // namespace devilution

2
Source/misdat.h

@ -8,7 +8,7 @@
#include "missiles.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/missiles.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
int missileactive[MAXMISSILES];
int missileavail[MAXMISSILES];
@ -5671,4 +5671,4 @@ void ClearMissileSpot(int mi)
dMissile[missile[mi]._mix][missile[mi]._miy] = 0;
}
}
} // namespace devilution

2
Source/missiles.h

@ -6,7 +6,7 @@
#ifndef __MISSILES_H__
#define __MISSILES_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/monstdat.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Contains the data related to each monster ID. */
const MonsterData monsterdata[] = {
@ -566,4 +566,4 @@ const UniqMonstStruct UniqMonst[] = {
// clang-format on
};
}
} // namespace devilution

2
Source/monstdat.h

@ -6,7 +6,7 @@
#ifndef __MONSTDAT_H__
#define __MONSTDAT_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/monster.cpp

@ -9,7 +9,7 @@
#include "options.h"
#include "../3rdParty/Storm/Source/storm.h"
namespace dvl {
namespace devilution {
/** Tracks which missile files are already loaded */
int MissileFileFlag;
@ -5707,4 +5707,4 @@ void decode_enemy(int m, int enemy)
}
}
}
} // namespace devilution

2
Source/monster.h

@ -6,7 +6,7 @@
#ifndef __MONSTER_H__
#define __MONSTER_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/movie.cpp

@ -7,7 +7,7 @@
#include "../3rdParty/Storm/Source/storm.h"
#include "../SourceX/display.h"
namespace dvl {
namespace devilution {
/** Should the movie continue playing. */
BYTE movie_playing;
@ -56,4 +56,4 @@ void play_movie(const char *pszMovie, BOOL user_can_close)
OutputToLogical(&MouseX, &MouseY);
}
}
} // namespace devilution

2
Source/movie.h

@ -6,7 +6,7 @@
#ifndef __MOVIE_H__
#define __MOVIE_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/mpqapi.cpp

@ -14,7 +14,7 @@
#include "all.h"
#include "../SourceS/file_util.h"
namespace dvl {
namespace devilution {
#define INDEX_ENTRIES 2048
@ -704,4 +704,4 @@ BOOL mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, DWORD dwChar)
return cur_archive.Close(/*clear_tables=*/bFree);
}
}
} // namespace devilution

2
Source/mpqapi.h

@ -8,7 +8,7 @@
#include <stdint.h>
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/msg.cpp

@ -8,7 +8,7 @@
#include "../DiabloUI/diabloui.h"
#include "options.h"
namespace dvl {
namespace devilution {
static DWORD sgdwOwnerWait;
static DWORD sgdwRecvOffset;
@ -2685,4 +2685,4 @@ DWORD ParseCmd(int pnum, TCmd *pCmd)
return On_DLEVEL(pnum, pCmd);
}
}
} // namespace devilution

2
Source/msg.h

@ -6,7 +6,7 @@
#ifndef __MSG_H__
#define __MSG_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/multi.cpp

@ -9,7 +9,7 @@
#include "../DiabloUI/diabloui.h"
#include <config.h>
namespace dvl {
namespace devilution {
BOOLEAN gbSomebodyWonGameKludge;
TBuffer sgHiPriBuf;
@ -919,4 +919,4 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, BOOL recv)
}
}
}
} // namespace devilution

2
Source/multi.h

@ -8,7 +8,7 @@
#include "msg.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/nthread.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "../3rdParty/Storm/Source/storm.h"
namespace dvl {
namespace devilution {
BYTE sgbNetUpdateRate;
DWORD gdwMsgLenTbl[MAX_PLRS];
@ -242,4 +242,4 @@ BOOL nthread_has_500ms_passed()
return ticksElapsed >= 0;
}
}
} // namespace devilution

2
Source/nthread.h

@ -6,7 +6,7 @@
#ifndef __NTHREAD_H__
#define __NTHREAD_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/objdat.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Maps from dun_object_id to object_id. */
const _object_id ObjTypeConv[] = {
@ -435,4 +435,4 @@ const char *ObjHiveLoadList[] = {
"LzStand",
};
}
} // namespace devilution

2
Source/objdat.h

@ -6,7 +6,7 @@
#ifndef __OBJDAT_H__
#define __OBJDAT_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/objects.cpp

@ -6,7 +6,7 @@
#include "all.h"
#include "options.h"
namespace dvl {
namespace devilution {
int trapid;
int trapdir;
@ -5271,4 +5271,4 @@ bool objects_lv_24_454B04(int s)
return FALSE;
}
}
} // namespace devilution

2
Source/objects.h

@ -6,7 +6,7 @@
#ifndef __OBJECTS_H__
#define __OBJECTS_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

2
Source/options.h

@ -1,6 +1,6 @@
#pragma once
namespace dvl {
namespace devilution {
struct DiabloOptions {
/** @brief Play game intro video on startup. */

4
Source/pack.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
void PackItem(PkItemStruct *id, const ItemStruct *is)
{
@ -301,4 +301,4 @@ void UnPackPlayer(PkPlayerStruct *pPack, int pnum, BOOL netSync)
pPlayer->pDamAcFlags = SwapLE32(pPack->pDamAcFlags);
}
}
} // namespace devilution

2
Source/pack.h

@ -8,7 +8,7 @@
#include "items.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/palette.cpp

@ -8,7 +8,7 @@
#include "../SourceX/display.h"
#include "../3rdParty/Storm/Source/storm.h"
namespace dvl {
namespace devilution {
SDL_Color logical_palette[256];
SDL_Color system_palette[256];
@ -383,4 +383,4 @@ void palette_update_quest_palette(int n)
GenerateBlendedLookupTable(logical_palette, 1, 31, 32 - n); // Possible optimization would be to only update color 0 as only the UI can overlap with transparency in this quest
}
}
} // namespace devilution

2
Source/palette.h

@ -6,7 +6,7 @@
#ifndef __PALETTE_H__
#define __PALETTE_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/path.cpp

@ -5,7 +5,7 @@
*/
#include "all.h"
namespace dvl {
namespace devilution {
/** Notes visisted by the path finding algorithm. */
PATHNODE path_nodes[MAXPATHNODES];
/** size of the pnode_tblptr stack */
@ -379,4 +379,4 @@ PATHNODE *path_new_step()
return new_node;
}
}
} // namespace devilution

2
Source/path.h

@ -6,7 +6,7 @@
#ifndef __PATH_H__
#define __PATH_H__
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/pfile.cpp

@ -10,7 +10,7 @@
#include "../3rdParty/Storm/Source/storm.h"
#include "file_util.h"
namespace dvl {
namespace devilution {
#define PASSWORD_SPAWN_SINGLE "adslhfb1"
#define PASSWORD_SPAWN_MULTI "lshbkfg1"
@ -551,4 +551,4 @@ void pfile_update(bool force_save)
pfile_write_hero();
}
}
} // namespace devilution

2
Source/pfile.h

@ -9,7 +9,7 @@
#include "player.h"
#include "../DiabloUI/diabloui.h"
namespace dvl {
namespace devilution {
#ifdef __cplusplus
extern "C" {

4
Source/player.cpp

@ -9,7 +9,7 @@
#include "options.h"
#include "../3rdParty/Storm/Source/storm.h"
namespace dvl {
namespace devilution {
int plr_lframe_size;
int plr_wframe_size;
@ -4411,4 +4411,4 @@ int get_max_dexterity(int i)
return MaxStats[i][ATTRIB_DEX];
}
}
} // namespace devilution

2
Source/player.h

@ -6,7 +6,7 @@
#ifndef __PLAYER_H__
#define __PLAYER_H__
namespace dvl {
namespace devilution {
typedef enum PLR_MODE {
PM_STAND,

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save