Browse Source

Add more missing <cstdint> includes

https://github.com/diasurgical/devilutionX/pull/6095 only added includes
for `uint32_t`, this PR also adds the includes for the remaining
integral types.
pull/6099/head
Gleb Mazovetskiy 3 years ago
parent
commit
5bf0b8bc96
  1. 1
      Source/DiabloUI/credits.cpp
  2. 1
      Source/DiabloUI/dialogs.cpp
  3. 2
      Source/automap.cpp
  4. 1
      Source/controls/modifier_hints.cpp
  5. 2
      Source/controls/touch/renderers.h
  6. 2
      Source/cursor.cpp
  7. 2
      Source/dead.cpp
  8. 9
      Source/dvlnet/packet.cpp
  9. 2
      Source/effects.cpp
  10. 1
      Source/engine/actor_position.cpp
  11. 2
      Source/engine/actor_position.hpp
  12. 3
      Source/engine/animationinfo.cpp
  13. 2
      Source/engine/demomode.h
  14. 2
      Source/engine/events.cpp
  15. 3
      Source/engine/load_cel.cpp
  16. 1
      Source/engine/load_cl2.cpp
  17. 2
      Source/engine/load_clx.cpp
  18. 1
      Source/engine/load_pcx.cpp
  19. 2
      Source/engine/render/automap_render.cpp
  20. 2
      Source/engine/render/automap_render.hpp
  21. 1
      Source/engine/render/clx_render.cpp
  22. 1
      Source/engine/surface.cpp
  23. 7
      Source/engine/trn.cpp
  24. 2
      Source/engine/trn.hpp
  25. 2
      Source/engine/world_tile.hpp
  26. 4
      Source/hwcursor.hpp
  27. 8
      Source/init.cpp
  28. 2
      Source/levels/crypt.cpp
  29. 2
      Source/levels/setmaps.cpp
  30. 2
      Source/levels/themes.cpp
  31. 2
      Source/levels/town.cpp
  32. 2
      Source/levels/trigs.cpp
  33. 1
      Source/lighting.cpp
  34. 1
      Source/lighting.h
  35. 2
      Source/misdat.cpp
  36. 1
      Source/missiles.cpp
  37. 4
      Source/monstdat.cpp
  38. 2
      Source/movie.cpp
  39. 1
      Source/panels/charpanel.cpp
  40. 2
      Source/panels/mainpanel.cpp
  41. 2
      Source/panels/spell_book.cpp
  42. 2
      Source/panels/spell_icons.cpp
  43. 2
      Source/panels/spell_icons.hpp
  44. 2
      Source/panels/spell_list.cpp
  45. 2
      Source/panels/ui_panels.hpp
  46. 2
      Source/platform/locale.cpp
  47. 2
      Source/platform/switch/docking.cpp
  48. 1
      Source/platform/vita/keyboard.cpp
  49. 3
      Source/qol/monhealthbar.cpp
  50. 1
      Source/qol/stash.cpp
  51. 1
      Source/qol/xpbar.cpp
  52. 2
      Source/spells.h
  53. 2
      Source/stores.h
  54. 2
      Source/textdat.h
  55. 2
      Source/towners.cpp
  56. 1
      Source/utils/push_aulib_decoder.cpp
  57. 5
      Source/utils/sdl_bilinear_scale.hpp
  58. 1
      Source/utils/soundsample.cpp

1
Source/DiabloUI/credits.cpp

@ -1,4 +1,5 @@
#include <algorithm>
#include <cstdint>
#include <memory>
#include <vector>

1
Source/DiabloUI/dialogs.cpp

@ -1,5 +1,6 @@
#include "DiabloUI/dialogs.h"
#include <cstdint>
#include <utility>
#include "DiabloUI/button.h"

2
Source/automap.cpp

@ -5,6 +5,8 @@
*/
#include "automap.h"
#include <cstdint>
#include <fmt/format.h>
#include "control.h"

1
Source/controls/modifier_hints.cpp

@ -1,6 +1,7 @@
#include "controls/modifier_hints.h"
#include <cstddef>
#include <cstdint>
#include "DiabloUI/ui_flags.hpp"
#include "control.h"

2
Source/controls/touch/renderers.h

@ -1,5 +1,7 @@
#pragma once
#include <cstdint>
#include <SDL.h>
#include "controls/plrctrls.h"

2
Source/cursor.cpp

@ -5,6 +5,8 @@
*/
#include "cursor.h"
#include <cstdint>
#include <fmt/format.h>
#include "DiabloUI/diabloui.h"

2
Source/dead.cpp

@ -5,6 +5,8 @@
*/
#include "dead.h"
#include <cstdint>
#include "diablo.h"
#include "levels/gendung.h"
#include "lighting.h"

9
Source/dvlnet/packet.cpp

@ -1,3 +1,8 @@
#include "dvlnet/packet.h"
#include <cassert>
#include <cstdint>
#ifdef PACKET_ENCRYPTION
#include <sodium.h>
#else
@ -5,10 +10,6 @@
#include <random>
#endif
#include <cassert>
#include "dvlnet/packet.h"
namespace devilution {
namespace net {

2
Source/effects.cpp

@ -5,6 +5,8 @@
*/
#include "effects.h"
#include <cstdint>
#include "engine/random.hpp"
#include "engine/sound.h"
#include "engine/sound_defs.hpp"

1
Source/engine/actor_position.cpp

@ -1,6 +1,7 @@
#include "actor_position.hpp"
#include <array>
#include <cstdint>
namespace devilution {

2
Source/engine/actor_position.hpp

@ -1,5 +1,7 @@
#pragma once
#include <cstdint>
#include "engine/animationinfo.h"
#include "engine/point.hpp"
#include "engine/world_tile.hpp"

3
Source/engine/animationinfo.cpp

@ -5,6 +5,9 @@
*/
#include "animationinfo.h"
#include <cstdint>
#include "appfat.h"
#include "nthread.h"
#include "utils/log.hpp"

2
Source/engine/demomode.h

@ -5,6 +5,8 @@
*/
#pragma once
#include <cstdint>
#include <SDL.h>
namespace devilution {

2
Source/engine/events.cpp

@ -1,5 +1,7 @@
#include "engine/events.hpp"
#include <cstdint>
#include "controls/input.h"
#include "engine.h"
#include "engine/demomode.h"

3
Source/engine/load_cel.cpp

@ -1,5 +1,8 @@
#include "engine/load_cel.hpp"
#include <cstddef>
#include <cstdint>
#ifdef DEBUG_CEL_TO_CL2_SIZE
#include <iostream>
#endif

1
Source/engine/load_cl2.cpp

@ -1,5 +1,6 @@
#include "engine/load_cl2.hpp"
#include <cstdint>
#include <memory>
#include <utility>

2
Source/engine/load_clx.cpp

@ -1,5 +1,7 @@
#include "engine/load_clx.hpp"
#include <cstdint>
#include <SDL.h>
#ifdef USE_SDL1

1
Source/engine/load_pcx.cpp

@ -1,6 +1,7 @@
#include "engine/load_pcx.hpp"
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <memory>
#include <utility>

2
Source/engine/render/automap_render.cpp

@ -5,6 +5,8 @@
*/
#include "engine/render/automap_render.hpp"
#include <cstdint>
namespace devilution {
namespace {

2
Source/engine/render/automap_render.hpp

@ -10,6 +10,8 @@
*/
#pragma once
#include <cstdint>
#include "engine.h"
#include "engine/point.hpp"

1
Source/engine/render/clx_render.cpp

@ -6,6 +6,7 @@
#include "clx_render.hpp"
#include <algorithm>
#include <cstdint>
#include "engine/render/blit_impl.hpp"
#include "engine/render/scrollrt.h"

1
Source/engine/surface.cpp

@ -1,5 +1,6 @@
#include "engine/surface.hpp"
#include <cstdint>
#include <cstring>
namespace devilution {

7
Source/engine/trn.cpp

@ -1,11 +1,14 @@
#include <fmt/format.h>
#include "engine/trn.hpp"
#include <cstdint>
#include <unordered_map>
#include <fmt/format.h>
#ifdef _DEBUG
#include "debug.h"
#endif
#include "engine/load_file.hpp"
#include "engine/trn.hpp"
#include "lighting.h"
namespace devilution {

2
Source/engine/trn.hpp

@ -5,6 +5,8 @@
*/
#pragma once
#include <cstdint>
#include "player.h"
#include "utils/stdcompat/optional.hpp"

2
Source/engine/world_tile.hpp

@ -1,5 +1,7 @@
#pragma once
#include <cstdint>
#include "engine/point.hpp"
#include "engine/rectangle.hpp"
#include "engine/size.hpp"

4
Source/hwcursor.hpp

@ -3,6 +3,10 @@
*
* Hardware cursor (SDL2 only).
*/
#pragma once
#include <cstdint>
#include <SDL_version.h>
#include "options.h"

8
Source/init.cpp

@ -3,11 +3,15 @@
*
* Implementation of routines for initializing the environment, disable screen saver, load MPQ.
*/
#include <SDL.h>
#include <config.h>
#include "init.h"
#include <cstdint>
#include <string>
#include <vector>
#include <SDL.h>
#include <config.h>
#if (defined(_WIN64) || defined(_WIN32)) && !defined(__UWP__) && !defined(NXDK)
#include <find_steam_game.h>
#endif

2
Source/levels/crypt.cpp

@ -1,5 +1,7 @@
#include "levels/crypt.h"
#include <cstdint>
#include "engine/load_file.hpp"
#include "engine/point.hpp"
#include "items.h"

2
Source/levels/setmaps.cpp

@ -1,5 +1,7 @@
#include "levels/setmaps.h"
#include <cstdint>
#ifdef _DEBUG
#include "debug.h"
#endif

2
Source/levels/themes.cpp

@ -5,6 +5,8 @@
*/
#include "levels/themes.h"
#include <cstdint>
#include <fmt/core.h>
#include "engine/path.h"

2
Source/levels/town.cpp

@ -1,5 +1,7 @@
#include "levels/town.h"
#include <cstdint>
#include "engine/load_file.hpp"
#include "engine/random.hpp"
#include "init.h"

2
Source/levels/trigs.cpp

@ -5,6 +5,8 @@
*/
#include "levels/trigs.h"
#include <cstdint>
#include <fmt/format.h>
#include "control.h"

1
Source/lighting.cpp

@ -6,6 +6,7 @@
#include "lighting.h"
#include <algorithm>
#include <cstdint>
#include <numeric>
#include "automap.h"

1
Source/lighting.h

@ -6,6 +6,7 @@
#pragma once
#include <array>
#include <cstdint>
#include <vector>
#include <function_ref.hpp>

2
Source/misdat.cpp

@ -5,6 +5,8 @@
*/
#include "misdat.h"
#include <cstdint>
#include "engine/load_cl2.hpp"
#include "engine/load_clx.hpp"
#include "missiles.h"

1
Source/missiles.cpp

@ -6,6 +6,7 @@
#include "missiles.h"
#include <climits>
#include <cstdint>
#include "control.h"
#include "controls/plrctrls.h"

4
Source/monstdat.cpp

@ -4,8 +4,10 @@
* Implementation of all monster data.
*/
#include "monstdat.h"
#include "items.h"
#include <cstdint>
#include "items.h"
#include "monster.h"
#include "textdat.h"
#include "utils/language.h"

2
Source/movie.cpp

@ -4,6 +4,8 @@
* Implementation of video playback.
*/
#include <cstdint>
#include "controls/plrctrls.h"
#include "diablo.h"
#include "effects.h"

1
Source/panels/charpanel.cpp

@ -1,5 +1,6 @@
#include "panels/charpanel.hpp"
#include <cstdint>
#include <string>
#include <fmt/format.h>

2
Source/panels/mainpanel.cpp

@ -1,5 +1,7 @@
#include "panels/mainpanel.hpp"
#include <cstdint>
#include "control.h"
#include "engine/clx_sprite.hpp"
#include "engine/load_clx.hpp"

2
Source/panels/spell_book.cpp

@ -1,5 +1,7 @@
#include "panels/spell_book.hpp"
#include <cstdint>
#include <fmt/format.h>
#include "control.h"

2
Source/panels/spell_icons.cpp

@ -1,5 +1,7 @@
#include "panels/spell_icons.hpp"
#include <cstdint>
#include "engine.h"
#include "engine/load_cel.hpp"
#include "engine/load_clx.hpp"

2
Source/panels/spell_icons.hpp

@ -1,5 +1,7 @@
#pragma once
#include <cstdint>
#include "engine/clx_sprite.hpp"
#include "engine/point.hpp"
#include "engine/surface.hpp"

2
Source/panels/spell_list.cpp

@ -1,5 +1,7 @@
#include "panels/spell_list.hpp"
#include <cstdint>
#include <fmt/format.h>
#include "control.h"

2
Source/panels/ui_panels.hpp

@ -1,5 +1,7 @@
#pragma once
#include <cstdint>
namespace devilution {
enum class UiPanels : uint8_t {

2
Source/platform/locale.cpp

@ -1,5 +1,7 @@
#include "locale.hpp"
#include <cstdint>
#ifdef __ANDROID__
#include "SDL.h"
#include <jni.h>

2
Source/platform/switch/docking.cpp

@ -1,5 +1,7 @@
#include "platform/switch/docking.h"
#include <cstdint>
#include <SDL.h>
#include <switch.h>

1
Source/platform/vita/keyboard.cpp

@ -1,5 +1,6 @@
#include "platform/vita/keyboard.h"
#include <cstdint>
#include <cstring>
#include <SDL.h>

3
Source/qol/monhealthbar.cpp

@ -3,6 +3,9 @@
*
* Adds monster health bar QoL feature
*/
#include "monhealthbar.h"
#include <cstdint>
#include <fmt/format.h>

1
Source/qol/stash.cpp

@ -1,5 +1,6 @@
#include "qol/stash.h"
#include <cstdint>
#include <utility>
#include <fmt/format.h>

1
Source/qol/xpbar.cpp

@ -6,6 +6,7 @@
#include "xpbar.h"
#include <array>
#include <cstdint>
#include <fmt/core.h>

2
Source/spells.h

@ -5,6 +5,8 @@
*/
#pragma once
#include <cstdint>
#include "player.h"
namespace devilution {

2
Source/stores.h

@ -5,6 +5,8 @@
*/
#pragma once
#include <cstdint>
#include "DiabloUI/ui_flags.hpp"
#include "control.h"
#include "engine.h"

2
Source/textdat.h

@ -5,6 +5,8 @@
*/
#pragma once
#include <cstdint>
#include "effects.h"
namespace devilution {

2
Source/towners.cpp

@ -1,5 +1,7 @@
#include "towners.h"
#include <cstdint>
#include "cursor.h"
#include "engine/clx_sprite.hpp"
#include "engine/load_cel.hpp"

1
Source/utils/push_aulib_decoder.cpp

@ -1,6 +1,7 @@
#include "push_aulib_decoder.h"
#include <algorithm>
#include <cstdint>
#include <cstring>
#include <limits>
#include <mutex>

5
Source/utils/sdl_bilinear_scale.hpp

@ -1,5 +1,8 @@
#pragma once
#include <array>
#include <cstdint>
#include <SDL_version.h>
#if SDL_VERSION_ATLEAST(2, 0, 0)
@ -8,8 +11,6 @@
#include <SDL_video.h>
#endif
#include <array>
namespace devilution {
/**

1
Source/utils/soundsample.cpp

@ -2,6 +2,7 @@
#include <chrono>
#include <cmath>
#include <cstdint>
#include <utility>
#include <Aulib/DecoderDrmp3.h>

Loading…
Cancel
Save