mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Move *dat files to tables dir

pull/8408/head
Eric Robinson 2 months ago committed by GitHub
parent
8d693507ae
commit
5937734b85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
69 changed files with 111 additions and 109 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      Source/CMakeLists.txt
  2. 2
      Source/DiabloUI/diabloui.cpp
  3. 2
      Source/DiabloUI/hero/selhero.cpp
  4. 2
      Source/control/control.hpp
  5. 2
      Source/dead.cpp
  6. 4
      Source/diablo.cpp
  7. 2
      Source/diablo.h
  8. 2
      Source/discord/discord.cpp
  9. 12
      Source/items.cpp
  10. 2
      Source/items.h
  11. 2
      Source/items/validation.cpp
  12. 2
      Source/levels/drlg_l3.cpp
  13. 2
      Source/levels/drlg_l4.cpp
  14. 2
      Source/levels/setmaps.cpp
  15. 2
      Source/levels/themes.h
  16. 2
      Source/loadsave.cpp
  17. 2
      Source/lua/modules/dev/monsters.cpp
  18. 2
      Source/lua/modules/dev/player/spells.cpp
  19. 2
      Source/lua/modules/items.cpp
  20. 2
      Source/lua/modules/monsters.cpp
  21. 4
      Source/minitext.cpp
  22. 2
      Source/minitext.h
  23. 10
      Source/missiles.cpp
  24. 4
      Source/missiles.h
  25. 14
      Source/monster.cpp
  26. 8
      Source/monster.h
  27. 2
      Source/objects.cpp
  28. 6
      Source/objects.h
  29. 2
      Source/pack.cpp
  30. 2
      Source/panels/charpanel.cpp
  31. 2
      Source/panels/partypanel.cpp
  32. 2
      Source/panels/spell_book.cpp
  33. 2
      Source/panels/spell_icons.hpp
  34. 2
      Source/panels/spell_list.hpp
  35. 2
      Source/pfile.cpp
  36. 4
      Source/player.h
  37. 2
      Source/portal.cpp
  38. 2
      Source/qol/floatingnumbers.h
  39. 2
      Source/qol/xpbar.cpp
  40. 2
      Source/quests.cpp
  41. 4
      Source/quests.h
  42. 4
      Source/quests/validation.cpp
  43. 2
      Source/quests/validation.hpp
  44. 2
      Source/stores.cpp
  45. 4
      Source/tables/itemdat.cpp
  46. 4
      Source/tables/itemdat.h
  47. 4
      Source/tables/misdat.cpp
  48. 2
      Source/tables/misdat.h
  49. 4
      Source/tables/monstdat.cpp
  50. 2
      Source/tables/monstdat.h
  51. 2
      Source/tables/objdat.cpp
  52. 0
      Source/tables/objdat.h
  53. 4
      Source/tables/playerdat.cpp
  54. 4
      Source/tables/playerdat.hpp
  55. 2
      Source/tables/spelldat.cpp
  56. 0
      Source/tables/spelldat.h
  57. 2
      Source/tables/textdat.cpp
  58. 0
      Source/tables/textdat.h
  59. 2
      Source/tables/townerdat.cpp
  60. 4
      Source/tables/townerdat.hpp
  61. 4
      Source/towners.cpp
  62. 4
      test/pack_test.cpp
  63. 2
      test/player_test.cpp
  64. 2
      test/quests_test.cpp
  65. 2
      test/tile_properties_test.cpp
  66. 4
      test/timedemo_test.cpp
  67. 2
      test/townerdat_test.cpp
  68. 2
      test/vendor_test.cpp
  69. 2
      test/writehero_test.cpp

18
Source/CMakeLists.txt
Unescape View File

@ -21,7 +21,6 @@ set(libdevilutionx_SRCS
loadsave.cpp loadsave.cpp
menu.cpp menu.cpp
minitext.cpp minitext.cpp
misdat.cpp
missiles.cpp missiles.cpp
movie.cpp movie.cpp
msg.cpp msg.cpp
@ -31,9 +30,7 @@ set(libdevilutionx_SRCS
portal.cpp portal.cpp
restrict.cpp restrict.cpp
sync.cpp sync.cpp
textdat.cpp
tmsg.cpp tmsg.cpp
townerdat.cpp
towners.cpp towners.cpp
track.cpp track.cpp
@ -156,6 +153,11 @@ set(libdevilutionx_SRCS
storm/storm_net.cpp storm/storm_net.cpp
storm/storm_svid.cpp storm/storm_svid.cpp
tables/misdat.cpp
tables/textdat.cpp
tables/townerdat.cpp
utils/display.cpp utils/display.cpp
utils/language.cpp utils/language.cpp
utils/sdl_bilinear_scale.cpp utils/sdl_bilinear_scale.cpp
@ -486,7 +488,7 @@ target_link_dependencies(libdevilutionx_logged_fstream PUBLIC
) )
add_devilutionx_object_library(libdevilutionx_items add_devilutionx_object_library(libdevilutionx_items
itemdat.cpp tables/itemdat.cpp
items.cpp items.cpp
) )
target_link_dependencies(libdevilutionx_items PUBLIC target_link_dependencies(libdevilutionx_items PUBLIC
@ -523,7 +525,7 @@ target_link_libraries(libdevilutionx_log INTERFACE
target_sources(libdevilutionx_log INTERFACE $<TARGET_OBJECTS:libdevilutionx_strings>) target_sources(libdevilutionx_log INTERFACE $<TARGET_OBJECTS:libdevilutionx_strings>)
add_devilutionx_object_library(libdevilutionx_level_objects add_devilutionx_object_library(libdevilutionx_level_objects
objdat.cpp tables/objdat.cpp
objects.cpp objects.cpp
) )
target_link_dependencies(libdevilutionx_level_objects PUBLIC target_link_dependencies(libdevilutionx_level_objects PUBLIC
@ -540,7 +542,7 @@ target_link_dependencies(libdevilutionx_level_objects PUBLIC
) )
add_devilutionx_object_library(libdevilutionx_monster add_devilutionx_object_library(libdevilutionx_monster
monstdat.cpp tables/monstdat.cpp
monster.cpp monster.cpp
) )
target_link_dependencies(libdevilutionx_monster target_link_dependencies(libdevilutionx_monster
@ -644,7 +646,7 @@ endif()
add_devilutionx_object_library(libdevilutionx_player add_devilutionx_object_library(libdevilutionx_player
player.cpp player.cpp
playerdat.cpp tables/playerdat.cpp
) )
target_link_dependencies(libdevilutionx_player target_link_dependencies(libdevilutionx_player
PUBLIC PUBLIC
@ -676,7 +678,7 @@ add_devilutionx_object_library(libdevilutionx_quick_messages
) )
add_devilutionx_object_library(libdevilutionx_spells add_devilutionx_object_library(libdevilutionx_spells
spelldat.cpp tables/spelldat.cpp
spells.cpp spells.cpp
) )
target_link_dependencies(libdevilutionx_spells PUBLIC target_link_dependencies(libdevilutionx_spells PUBLIC

2
Source/DiabloUI/diabloui.cpp
Unescape View File

@ -50,8 +50,8 @@
#include "init.hpp" #include "init.hpp"
#include "options.h" #include "options.h"
#include "player.h" #include "player.h"
#include "playerdat.hpp"
#include "sound_effect_enums.h" #include "sound_effect_enums.h"
#include "tables/playerdat.hpp"
#include "utils/algorithm/container.hpp" #include "utils/algorithm/container.hpp"
#include "utils/display.h" #include "utils/display.h"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"

2
Source/DiabloUI/hero/selhero.cpp
Unescape View File

@ -33,7 +33,7 @@
#include "levels/gendung.h" #include "levels/gendung.h"
#include "options.h" #include "options.h"
#include "pfile.h" #include "pfile.h"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"
#include "utils/language.h" #include "utils/language.h"
#include "utils/sdl_geometry.h" #include "utils/sdl_geometry.h"

2
Source/control/control.hpp
Unescape View File

@ -28,8 +28,8 @@
#include "engine/render/text_render.hpp" #include "engine/render/text_render.hpp"
#include "engine/size.hpp" #include "engine/size.hpp"
#include "panels/ui_panels.hpp" #include "panels/ui_panels.hpp"
#include "spelldat.h"
#include "spells.h" #include "spells.h"
#include "tables/spelldat.h"
#include "utils/attributes.h" #include "utils/attributes.h"
#include "utils/string_or_view.hpp" #include "utils/string_or_view.hpp"
#include "utils/ui_fwd.h" #include "utils/ui_fwd.h"

2
Source/dead.cpp
Unescape View File

@ -11,8 +11,8 @@
#include "headless_mode.hpp" #include "headless_mode.hpp"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "lighting.h" #include "lighting.h"
#include "misdat.h"
#include "monster.h" #include "monster.h"
#include "tables/misdat.h"
namespace devilution { namespace devilution {

4
Source/diablo.cpp
Unescape View File

@ -76,7 +76,6 @@
#include "menu.h" #include "menu.h"
#include "minitext.h" #include "minitext.h"
#include "missiles.h" #include "missiles.h"
#include "monstdat.h"
#include "movie.h" #include "movie.h"
#include "multi.h" #include "multi.h"
#include "nthread.h" #include "nthread.h"
@ -88,7 +87,6 @@
#include "panels/spell_book.hpp" #include "panels/spell_book.hpp"
#include "panels/spell_list.hpp" #include "panels/spell_list.hpp"
#include "pfile.h" #include "pfile.h"
#include "playerdat.hpp"
#include "plrmsg.h" #include "plrmsg.h"
#include "qol/chatlog.h" #include "qol/chatlog.h"
#include "qol/floatingnumbers.h" #include "qol/floatingnumbers.h"
@ -101,6 +99,8 @@
#include "stores.h" #include "stores.h"
#include "storm/storm_net.hpp" #include "storm/storm_net.hpp"
#include "storm/storm_svid.h" #include "storm/storm_svid.h"
#include "tables/monstdat.h"
#include "tables/playerdat.hpp"
#include "towners.h" #include "towners.h"
#include "track.h" #include "track.h"
#include "utils/console.h" #include "utils/console.h"

2
Source/diablo.h
Unescape View File

@ -19,7 +19,7 @@
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG
#include "monstdat.h" #include "tables/monstdat.h"
#endif #endif
#include "levels/gendung.h" #include "levels/gendung.h"
#include "utils/attributes.h" #include "utils/attributes.h"

2
Source/discord/discord.cpp
Unescape View File

@ -23,7 +23,7 @@
#include "multi.h" #include "multi.h"
#include "panels/charpanel.hpp" #include "panels/charpanel.hpp"
#include "player.h" #include "player.h"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "utils/language.h" #include "utils/language.h"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"

12
Source/items.cpp
Unescape View File

@ -52,7 +52,6 @@
#include "headless_mode.hpp" #include "headless_mode.hpp"
#include "inv.h" #include "inv.h"
#include "inv_iterators.hpp" #include "inv_iterators.hpp"
#include "itemdat.h"
#include "items/validation.h" #include "items/validation.h"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "levels/gendung_defs.hpp" #include "levels/gendung_defs.hpp"
@ -60,25 +59,26 @@
#include "levels/town.h" #include "levels/town.h"
#include "lighting.h" #include "lighting.h"
#include "minitext.h" #include "minitext.h"
#include "monstdat.h"
#include "monster.h" #include "monster.h"
#include "msg.h" #include "msg.h"
#include "multi.h" #include "multi.h"
#include "objdat.h"
#include "objects.h" #include "objects.h"
#include "options.h" #include "options.h"
#include "pack.h" #include "pack.h"
#include "panels/info_box.hpp" #include "panels/info_box.hpp"
#include "panels/ui_panels.hpp" #include "panels/ui_panels.hpp"
#include "player.h" #include "player.h"
#include "playerdat.hpp"
#include "qol/stash.h" #include "qol/stash.h"
#include "quests.h" #include "quests.h"
#include "sound_effect_enums.h" #include "sound_effect_enums.h"
#include "spelldat.h"
#include "spells.h" #include "spells.h"
#include "stores.h" #include "stores.h"
#include "textdat.h" #include "tables/itemdat.h"
#include "tables/monstdat.h"
#include "tables/objdat.h"
#include "tables/playerdat.hpp"
#include "tables/spelldat.h"
#include "tables/textdat.h"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"
#include "utils/format_int.hpp" #include "utils/format_int.hpp"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"

2
Source/items.h
Unescape View File

@ -13,9 +13,9 @@
#include "engine/animationinfo.h" #include "engine/animationinfo.h"
#include "engine/point.hpp" #include "engine/point.hpp"
#include "engine/surface.hpp" #include "engine/surface.hpp"
#include "itemdat.h"
#include "levels/dun_tile.hpp" #include "levels/dun_tile.hpp"
#include "monster.h" #include "monster.h"
#include "tables/itemdat.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
#include "utils/string_or_view.hpp" #include "utils/string_or_view.hpp"

2
Source/items/validation.cpp
Unescape View File

@ -9,10 +9,10 @@
#include <cstdint> #include <cstdint>
#include "items.h" #include "items.h"
#include "monstdat.h"
#include "msg.h" #include "msg.h"
#include "player.h" #include "player.h"
#include "spells.h" #include "spells.h"
#include "tables/monstdat.h"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"

2
Source/levels/drlg_l3.cpp
Unescape View File

@ -10,10 +10,10 @@
#include "levels/setmaps.h" #include "levels/setmaps.h"
#include "lighting.h" #include "lighting.h"
#include "monster.h" #include "monster.h"
#include "objdat.h"
#include "objects.h" #include "objects.h"
#include "player.h" #include "player.h"
#include "quests.h" #include "quests.h"
#include "tables/objdat.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
namespace devilution { namespace devilution {

2
Source/levels/drlg_l4.cpp
Unescape View File

@ -12,8 +12,8 @@
#include "levels/gendung.h" #include "levels/gendung.h"
#include "monster.h" #include "monster.h"
#include "multi.h" #include "multi.h"
#include "objdat.h"
#include "player.h" #include "player.h"
#include "tables/objdat.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
namespace devilution { namespace devilution {

2
Source/levels/setmaps.cpp
Unescape View File

@ -14,9 +14,9 @@
#include "levels/gendung.h" #include "levels/gendung.h"
#include "levels/trigs.h" #include "levels/trigs.h"
#include "msg.h" #include "msg.h"
#include "objdat.h"
#include "objects.h" #include "objects.h"
#include "quests.h" #include "quests.h"
#include "tables/objdat.h"
#include "utils/language.h" #include "utils/language.h"
namespace devilution { namespace devilution {

2
Source/levels/themes.h
Unescape View File

@ -8,7 +8,7 @@
#include <cstdint> #include <cstdint>
#include "levels/gendung.h" #include "levels/gendung.h"
#include "objdat.h" #include "tables/objdat.h"
namespace devilution { namespace devilution {

2
Source/loadsave.cpp
Unescape View File

@ -33,10 +33,10 @@
#include "monsters/validation.hpp" #include "monsters/validation.hpp"
#include "mpq/mpq_common.hpp" #include "mpq/mpq_common.hpp"
#include "pfile.h" #include "pfile.h"
#include "playerdat.hpp"
#include "plrmsg.h" #include "plrmsg.h"
#include "qol/stash.h" #include "qol/stash.h"
#include "stores.h" #include "stores.h"
#include "tables/playerdat.hpp"
#include "utils/algorithm/container.hpp" #include "utils/algorithm/container.hpp"
#include "utils/endian_read.hpp" #include "utils/endian_read.hpp"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"

2
Source/lua/modules/dev/monsters.cpp
Unescape View File

@ -11,9 +11,9 @@
#include "levels/tile_properties.hpp" #include "levels/tile_properties.hpp"
#include "lighting.h" #include "lighting.h"
#include "lua/metadoc.hpp" #include "lua/metadoc.hpp"
#include "monstdat.h"
#include "monster.h" #include "monster.h"
#include "player.h" #include "player.h"
#include "tables/monstdat.h"
#include "utils/str_case.hpp" #include "utils/str_case.hpp"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"

2
Source/lua/modules/dev/player/spells.cpp
Unescape View File

@ -8,8 +8,8 @@
#include "lua/metadoc.hpp" #include "lua/metadoc.hpp"
#include "msg.h" #include "msg.h"
#include "spelldat.h"
#include "spells.h" #include "spells.h"
#include "tables/spelldat.h"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"
namespace devilution { namespace devilution {

2
Source/lua/modules/items.cpp
Unescape View File

@ -6,10 +6,10 @@
#include <sol/sol.hpp> #include <sol/sol.hpp>
#include "data/file.hpp" #include "data/file.hpp"
#include "itemdat.h"
#include "items.h" #include "items.h"
#include "lua/metadoc.hpp" #include "lua/metadoc.hpp"
#include "player.h" #include "player.h"
#include "tables/itemdat.h"
#include "utils/utf8.hpp" #include "utils/utf8.hpp"
namespace devilution { namespace devilution {

2
Source/lua/modules/monsters.cpp
Unescape View File

@ -7,7 +7,7 @@
#include "data/file.hpp" #include "data/file.hpp"
#include "lua/metadoc.hpp" #include "lua/metadoc.hpp"
#include "monstdat.h" #include "tables/monstdat.h"
#include "utils/language.h" #include "utils/language.h"
#include "utils/str_split.hpp" #include "utils/str_split.hpp"

4
Source/minitext.cpp
Unescape View File

@ -17,8 +17,8 @@
#include "engine/render/clx_render.hpp" #include "engine/render/clx_render.hpp"
#include "engine/render/primitive_render.hpp" #include "engine/render/primitive_render.hpp"
#include "engine/render/text_render.hpp" #include "engine/render/text_render.hpp"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "textdat.h" #include "tables/textdat.h"
#include "utils/language.h" #include "utils/language.h"
#include "utils/timer.hpp" #include "utils/timer.hpp"

2
Source/minitext.h
Unescape View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#include "engine/surface.hpp" #include "engine/surface.hpp"
#include "textdat.h" #include "tables/textdat.h"
namespace devilution { namespace devilution {

10
Source/missiles.cpp
Unescape View File

@ -37,19 +37,19 @@
#include "engine/world_tile.hpp" #include "engine/world_tile.hpp"
#include "function_ref.hpp" #include "function_ref.hpp"
#include "interfac.h" #include "interfac.h"
#include "itemdat.h"
#include "items.h" #include "items.h"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "levels/gendung_defs.hpp" #include "levels/gendung_defs.hpp"
#include "misdat.h"
#include "monstdat.h"
#include "msg.h" #include "msg.h"
#include "multi.h" #include "multi.h"
#include "objects.h" #include "objects.h"
#include "player.h" #include "player.h"
#include "playerdat.hpp"
#include "sound_effect_enums.h" #include "sound_effect_enums.h"
#include "spelldat.h" #include "tables/itemdat.h"
#include "tables/misdat.h"
#include "tables/monstdat.h"
#include "tables/playerdat.hpp"
#include "tables/spelldat.h"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"
#ifdef _DEBUG #ifdef _DEBUG
#include "debug.h" #include "debug.h"

4
Source/missiles.h
Unescape View File

@ -12,10 +12,10 @@
#include "engine/displacement.hpp" #include "engine/displacement.hpp"
#include "engine/point.hpp" #include "engine/point.hpp"
#include "engine/world_tile.hpp" #include "engine/world_tile.hpp"
#include "misdat.h"
#include "monster.h" #include "monster.h"
#include "player.h" #include "player.h"
#include "spelldat.h" #include "tables/misdat.h"
#include "tables/spelldat.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
namespace devilution { namespace devilution {

14
Source/monster.cpp
Unescape View File

@ -59,7 +59,6 @@
#include "game_mode.hpp" #include "game_mode.hpp"
#include "headless_mode.hpp" #include "headless_mode.hpp"
#include "inv.h" #include "inv.h"
#include "itemdat.h"
#include "items.h" #include "items.h"
#include "levels/crypt.h" #include "levels/crypt.h"
#include "levels/drlg_l4.h" #include "levels/drlg_l4.h"
@ -71,23 +70,24 @@
#include "levels/trigs.h" #include "levels/trigs.h"
#include "lighting.h" #include "lighting.h"
#include "minitext.h" #include "minitext.h"
#include "misdat.h"
#include "missiles.h" #include "missiles.h"
#include "monstdat.h"
#include "movie.h" #include "movie.h"
#include "msg.h" #include "msg.h"
#include "multi.h" #include "multi.h"
#include "objdat.h"
#include "objects.h" #include "objects.h"
#include "options.h" #include "options.h"
#include "player.h" #include "player.h"
#include "playerdat.hpp"
#include "qol/floatingnumbers.h" #include "qol/floatingnumbers.h"
#include "quests.h" #include "quests.h"
#include "sound_effect_enums.h" #include "sound_effect_enums.h"
#include "spelldat.h"
#include "storm/storm_net.hpp" #include "storm/storm_net.hpp"
#include "textdat.h" #include "tables/itemdat.h"
#include "tables/misdat.h"
#include "tables/monstdat.h"
#include "tables/objdat.h"
#include "tables/playerdat.hpp"
#include "tables/spelldat.h"
#include "tables/textdat.h"
#include "utils/algorithm/container.hpp" #include "utils/algorithm/container.hpp"
#include "utils/attributes.h" #include "utils/attributes.h"
#include "utils/cl2_to_clx.hpp" #include "utils/cl2_to_clx.hpp"

8
Source/monster.h
Unescape View File

@ -23,10 +23,10 @@
#include "engine/world_tile.hpp" #include "engine/world_tile.hpp"
#include "game_mode.hpp" #include "game_mode.hpp"
#include "levels/dun_tile.hpp" #include "levels/dun_tile.hpp"
#include "misdat.h" #include "tables/misdat.h"
#include "monstdat.h" #include "tables/monstdat.h"
#include "spelldat.h" #include "tables/spelldat.h"
#include "textdat.h" #include "tables/textdat.h"
#include "utils/language.h" #include "utils/language.h"
namespace devilution { namespace devilution {

2
Source/objects.cpp
Unescape View File

@ -38,10 +38,10 @@
#include "minitext.h" #include "minitext.h"
#include "missiles.h" #include "missiles.h"
#include "monster.h" #include "monster.h"
#include "objdat.h"
#include "options.h" #include "options.h"
#include "qol/stash.h" #include "qol/stash.h"
#include "stores.h" #include "stores.h"
#include "tables/objdat.h"
#include "towners.h" #include "towners.h"
#include "track.h" #include "track.h"
#include "utils/algorithm/container.hpp" #include "utils/algorithm/container.hpp"

6
Source/objects.h
Unescape View File

@ -16,11 +16,11 @@
#include "engine/point.hpp" #include "engine/point.hpp"
#include "engine/rectangle.hpp" #include "engine/rectangle.hpp"
#include "engine/world_tile.hpp" #include "engine/world_tile.hpp"
#include "itemdat.h"
#include "levels/dun_tile.hpp" #include "levels/dun_tile.hpp"
#include "monster.h" #include "monster.h"
#include "objdat.h" #include "tables/itemdat.h"
#include "textdat.h" #include "tables/objdat.h"
#include "tables/textdat.h"
#include "utils/attributes.h" #include "utils/attributes.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
#include "utils/string_or_view.hpp" #include "utils/string_or_view.hpp"

2
Source/pack.cpp
Unescape View File

@ -11,9 +11,9 @@
#include "game_mode.hpp" #include "game_mode.hpp"
#include "items/validation.h" #include "items/validation.h"
#include "loadsave.h" #include "loadsave.h"
#include "playerdat.hpp"
#include "plrmsg.h" #include "plrmsg.h"
#include "stores.h" #include "stores.h"
#include "tables/playerdat.hpp"
#include "utils/endian_read.hpp" #include "utils/endian_read.hpp"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"

2
Source/panels/charpanel.cpp
Unescape View File

@ -15,7 +15,7 @@
#include "engine/render/text_render.hpp" #include "engine/render/text_render.hpp"
#include "panels/ui_panels.hpp" #include "panels/ui_panels.hpp"
#include "player.h" #include "player.h"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "utils/algorithm/container.hpp" #include "utils/algorithm/container.hpp"
#include "utils/display.h" #include "utils/display.h"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"

2
Source/panels/partypanel.cpp
Unescape View File

@ -17,10 +17,10 @@
#include "inv.h" #include "inv.h"
#include "options.h" #include "options.h"
#include "pfile.h" #include "pfile.h"
#include "playerdat.hpp"
#include "qol/monhealthbar.h" #include "qol/monhealthbar.h"
#include "qol/stash.h" #include "qol/stash.h"
#include "stores.h" #include "stores.h"
#include "tables/playerdat.hpp"
#include "utils/status_macros.hpp" #include "utils/status_macros.hpp"
#include "utils/surface_to_clx.hpp" #include "utils/surface_to_clx.hpp"

2
Source/panels/spell_book.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "panels/spell_icons.hpp" #include "panels/spell_icons.hpp"
#include "panels/ui_panels.hpp" #include "panels/ui_panels.hpp"
#include "player.h" #include "player.h"
#include "spelldat.h" #include "tables/spelldat.h"
#include "utils/language.h" #include "utils/language.h"
#include "utils/status_macros.hpp" #include "utils/status_macros.hpp"

2
Source/panels/spell_icons.hpp
Unescape View File

@ -8,7 +8,7 @@
#include "engine/clx_sprite.hpp" #include "engine/clx_sprite.hpp"
#include "engine/point.hpp" #include "engine/point.hpp"
#include "engine/surface.hpp" #include "engine/surface.hpp"
#include "spelldat.h" #include "tables/spelldat.h"
#define SPLICONLENGTH 56 #define SPLICONLENGTH 56

2
Source/panels/spell_list.hpp
Unescape View File

@ -5,7 +5,7 @@
#include "engine/point.hpp" #include "engine/point.hpp"
#include "engine/surface.hpp" #include "engine/surface.hpp"
#include "spelldat.h" #include "tables/spelldat.h"
namespace devilution { namespace devilution {

2
Source/pfile.cpp
Unescape View File

@ -27,8 +27,8 @@
#include "menu.h" #include "menu.h"
#include "mpq/mpq_common.hpp" #include "mpq/mpq_common.hpp"
#include "pack.h" #include "pack.h"
#include "playerdat.hpp"
#include "qol/stash.h" #include "qol/stash.h"
#include "tables/playerdat.hpp"
#include "utils/endian_read.hpp" #include "utils/endian_read.hpp"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"
#include "utils/file_util.h" #include "utils/file_util.h"

4
Source/player.h
Unescape View File

@ -26,8 +26,8 @@
#include "levels/dun_tile.hpp" #include "levels/dun_tile.hpp"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "multi.h" #include "multi.h"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "spelldat.h" #include "tables/spelldat.h"
#include "utils/attributes.h" #include "utils/attributes.h"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"

2
Source/portal.cpp
Unescape View File

@ -6,10 +6,10 @@
#include "portal.h" #include "portal.h"
#include "lighting.h" #include "lighting.h"
#include "misdat.h"
#include "missiles.h" #include "missiles.h"
#include "multi.h" #include "multi.h"
#include "player.h" #include "player.h"
#include "tables/misdat.h"
namespace devilution { namespace devilution {

2
Source/qol/floatingnumbers.h
Unescape View File

@ -6,9 +6,9 @@
#pragma once #pragma once
#include "engine/point.hpp" #include "engine/point.hpp"
#include "misdat.h"
#include "monster.h" #include "monster.h"
#include "player.h" #include "player.h"
#include "tables/misdat.h"
namespace devilution { namespace devilution {

2
Source/qol/xpbar.cpp
Unescape View File

@ -18,7 +18,7 @@
#include "engine/render/primitive_render.hpp" #include "engine/render/primitive_render.hpp"
#include "game_mode.hpp" #include "game_mode.hpp"
#include "options.h" #include "options.h"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "utils/format_int.hpp" #include "utils/format_int.hpp"
#include "utils/language.h" #include "utils/language.h"

2
Source/quests.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "options.h" #include "options.h"
#include "panels/ui_panels.hpp" #include "panels/ui_panels.hpp"
#include "stores.h" #include "stores.h"
#include "townerdat.hpp" #include "tables/townerdat.hpp"
#include "towners.h" #include "towners.h"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"

4
Source/quests.h
Unescape View File

@ -12,9 +12,9 @@
#include "engine/surface.hpp" #include "engine/surface.hpp"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "monster.h" #include "monster.h"
#include "objdat.h"
#include "panels/info_box.hpp" #include "panels/info_box.hpp"
#include "textdat.h" #include "tables/objdat.h"
#include "tables/textdat.h"
#include "utils/attributes.h" #include "utils/attributes.h"
namespace devilution { namespace devilution {

4
Source/quests/validation.cpp
Unescape View File

@ -8,9 +8,9 @@
#include <cstdint> #include <cstdint>
#include "objdat.h"
#include "quests.h" #include "quests.h"
#include "textdat.h" #include "tables/objdat.h"
#include "tables/textdat.h"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
namespace devilution { namespace devilution {

2
Source/quests/validation.hpp
Unescape View File

@ -7,8 +7,8 @@
#include <cstdint> #include <cstdint>
#include "objdat.h"
#include "quests.h" #include "quests.h"
#include "tables/objdat.h"
namespace devilution { namespace devilution {

2
Source/stores.cpp
Unescape View File

@ -26,7 +26,7 @@
#include "options.h" #include "options.h"
#include "panels/info_box.hpp" #include "panels/info_box.hpp"
#include "qol/stash.h" #include "qol/stash.h"
#include "townerdat.hpp" #include "tables/townerdat.hpp"
#include "towners.h" #include "towners.h"
#include "utils/format_int.hpp" #include "utils/format_int.hpp"
#include "utils/language.h" #include "utils/language.h"

4
Source/itemdat.cpp → Source/tables/itemdat.cpp
Unescape View File

@ -4,7 +4,7 @@
* Implementation of all item data. * Implementation of all item data.
*/ */
#include "itemdat.h" #include "tables/itemdat.h"
#include <string_view> #include <string_view>
#include <vector> #include <vector>
@ -15,7 +15,7 @@
#include "data/iterators.hpp" #include "data/iterators.hpp"
#include "data/record_reader.hpp" #include "data/record_reader.hpp"
#include "lua/lua_global.hpp" #include "lua/lua_global.hpp"
#include "spelldat.h" #include "tables/spelldat.h"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"
namespace devilution { namespace devilution {

4
Source/itemdat.h → Source/tables/itemdat.h
Unescape View File

@ -13,8 +13,8 @@
#include <expected.hpp> #include <expected.hpp>
#include <magic_enum/magic_enum.hpp> #include <magic_enum/magic_enum.hpp>
#include "objdat.h" #include "tables/objdat.h"
#include "spelldat.h" #include "tables/spelldat.h"
namespace devilution { namespace devilution {

4
Source/misdat.cpp → Source/tables/misdat.cpp
Unescape View File

@ -3,7 +3,7 @@
* *
* Implementation of data related to missiles. * Implementation of data related to missiles.
*/ */
#include "misdat.h" #include "tables/misdat.h"
#include <array> #include <array>
#include <cassert> #include <cassert>
@ -25,7 +25,7 @@
#include "missiles.h" #include "missiles.h"
#include "mpq/mpq_common.hpp" #include "mpq/mpq_common.hpp"
#include "sound_effect_enums.h" #include "sound_effect_enums.h"
#include "spelldat.h" #include "tables/spelldat.h"
#include "utils/file_name_generator.hpp" #include "utils/file_name_generator.hpp"
#include "utils/status_macros.hpp" #include "utils/status_macros.hpp"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"

2
Source/misdat.h → Source/tables/misdat.h
Unescape View File

@ -14,7 +14,7 @@
#include "effects.h" #include "effects.h"
#include "engine/clx_sprite.hpp" #include "engine/clx_sprite.hpp"
#include "spelldat.h" #include "tables/spelldat.h"
#include "utils/enum_traits.h" #include "utils/enum_traits.h"
namespace devilution { namespace devilution {

4
Source/monstdat.cpp → Source/tables/monstdat.cpp
Unescape View File

@ -3,7 +3,7 @@
* *
* Implementation of all monster data. * Implementation of all monster data.
*/ */
#include "monstdat.h" #include "tables/monstdat.h"
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
@ -26,7 +26,7 @@
#include "items.h" #include "items.h"
#include "lua/lua_global.hpp" #include "lua/lua_global.hpp"
#include "monster.h" #include "monster.h"
#include "textdat.h" #include "tables/textdat.h"
#include "utils/language.h" #include "utils/language.h"
namespace devilution { namespace devilution {

2
Source/monstdat.h → Source/tables/monstdat.h
Unescape View File

@ -13,7 +13,7 @@
#include <magic_enum/magic_enum.hpp> #include <magic_enum/magic_enum.hpp>
#include "cursor.h" #include "cursor.h"
#include "textdat.h" #include "tables/textdat.h"
namespace devilution { namespace devilution {

2
Source/objdat.cpp → Source/tables/objdat.cpp
Unescape View File

@ -3,7 +3,7 @@
* *
* Implementation of all object data. * Implementation of all object data.
*/ */
#include "objdat.h" #include "tables/objdat.h"
#include <string> #include <string>
#include <string_view> #include <string_view>

0
Source/objdat.h → Source/tables/objdat.h
Unescape View File

4
Source/playerdat.cpp → Source/tables/playerdat.cpp
Unescape View File

@ -4,7 +4,7 @@
* Implementation of all player data. * Implementation of all player data.
*/ */
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include <algorithm> #include <algorithm>
#include <array> #include <array>
@ -22,7 +22,7 @@
#include "data/value_reader.hpp" #include "data/value_reader.hpp"
#include "items.h" #include "items.h"
#include "player.h" #include "player.h"
#include "textdat.h" #include "tables/textdat.h"
#include "utils/language.h" #include "utils/language.h"
#include "utils/static_vector.hpp" #include "utils/static_vector.hpp"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"

4
Source/playerdat.hpp → Source/tables/playerdat.hpp
Unescape View File

@ -9,8 +9,8 @@
#include <cstdint> #include <cstdint>
#include "effects.h" #include "effects.h"
#include "itemdat.h" #include "tables/itemdat.h"
#include "spelldat.h" #include "tables/spelldat.h"
namespace devilution { namespace devilution {

2
Source/spelldat.cpp → Source/tables/spelldat.cpp
Unescape View File

@ -3,7 +3,7 @@
* *
* Implementation of all spell data. * Implementation of all spell data.
*/ */
#include "spelldat.h" #include "tables/spelldat.h"
#include <optional> #include <optional>
#include <string_view> #include <string_view>

0
Source/spelldat.h → Source/tables/spelldat.h
Unescape View File

2
Source/textdat.cpp → Source/tables/textdat.cpp
Unescape View File

@ -3,7 +3,7 @@
* *
* Implementation of all dialog texts. * Implementation of all dialog texts.
*/ */
#include "textdat.h" #include "tables/textdat.h"
#include <ankerl/unordered_dense.h> #include <ankerl/unordered_dense.h>
#include <fmt/core.h> #include <fmt/core.h>

0
Source/textdat.h → Source/tables/textdat.h
Unescape View File

2
Source/townerdat.cpp → Source/tables/townerdat.cpp
Unescape View File

@ -3,7 +3,7 @@
* *
* Implementation of towner data loading from TSV files. * Implementation of towner data loading from TSV files.
*/ */
#include "townerdat.hpp" #include "tables/townerdat.hpp"
#include <charconv> #include <charconv>
#include <optional> #include <optional>

4
Source/townerdat.hpp → Source/tables/townerdat.hpp
Unescape View File

@ -12,8 +12,8 @@
#include "engine/direction.hpp" #include "engine/direction.hpp"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "objdat.h" #include "tables/objdat.h"
#include "textdat.h" #include "tables/textdat.h"
#include "towners.h" #include "towners.h"
#include "utils/attributes.h" #include "utils/attributes.h"

4
Source/towners.cpp
Unescape View File

@ -13,8 +13,8 @@
#include "inv.h" #include "inv.h"
#include "minitext.h" #include "minitext.h"
#include "stores.h" #include "stores.h"
#include "textdat.h" #include "tables/textdat.h"
#include "townerdat.hpp" #include "tables/townerdat.hpp"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
#include "utils/language.h" #include "utils/language.h"
#include "utils/str_case.hpp" #include "utils/str_case.hpp"

4
test/pack_test.cpp
Unescape View File

@ -5,9 +5,9 @@
#include "cursor.h" #include "cursor.h"
#include "engine/assets.hpp" #include "engine/assets.hpp"
#include "game_mode.hpp" #include "game_mode.hpp"
#include "monstdat.h"
#include "pack.h" #include "pack.h"
#include "playerdat.hpp" #include "tables/monstdat.h"
#include "tables/playerdat.hpp"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"
#include "utils/is_of.hpp" #include "utils/is_of.hpp"
#include "utils/paths.h" #include "utils/paths.h"

2
test/player_test.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "cursor.h" #include "cursor.h"
#include "engine/assets.hpp" #include "engine/assets.hpp"
#include "init.hpp" #include "init.hpp"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
using namespace devilution; using namespace devilution;

2
test/quests_test.cpp
Unescape View File

@ -3,7 +3,7 @@
#include "quests.h" #include "quests.h"
#include "objdat.h" // For quest IDs #include "tables/objdat.h" // For quest IDs
namespace devilution { namespace devilution {
void ResetQuests() void ResetQuests()

2
test/tile_properties_test.cpp
Unescape View File

@ -5,8 +5,8 @@
#include "levels/dun_tile.hpp" #include "levels/dun_tile.hpp"
#include "levels/gendung.h" #include "levels/gendung.h"
#include "objdat.h"
#include "objects.h" #include "objects.h"
#include "tables/objdat.h"
namespace devilution { namespace devilution {
namespace { namespace {

4
test/timedemo_test.cpp
Unescape View File

@ -14,10 +14,10 @@
#include "headless_mode.hpp" #include "headless_mode.hpp"
#include "init.hpp" #include "init.hpp"
#include "lua/lua_global.hpp" #include "lua/lua_global.hpp"
#include "monstdat.h"
#include "options.h" #include "options.h"
#include "pfile.h" #include "pfile.h"
#include "playerdat.hpp" #include "tables/monstdat.h"
#include "tables/playerdat.hpp"
#include "utils/display.h" #include "utils/display.h"
#include "utils/paths.h" #include "utils/paths.h"

2
test/townerdat_test.cpp
Unescape View File

@ -7,7 +7,7 @@
#endif #endif
#include "engine/assets.hpp" #include "engine/assets.hpp"
#include "townerdat.hpp" #include "tables/townerdat.hpp"
#include "towners.h" #include "towners.h"
#include "utils/paths.h" #include "utils/paths.h"

2
test/vendor_test.cpp
Unescape View File

@ -3,8 +3,8 @@
#include "items.h" #include "items.h"
#include "player.h" #include "player.h"
#include "playerdat.hpp"
#include "stores.h" #include "stores.h"
#include "tables/playerdat.hpp"
#include "engine/assets.hpp" #include "engine/assets.hpp"
#include "engine/random.hpp" #include "engine/random.hpp"

2
test/writehero_test.cpp
Unescape View File

@ -14,7 +14,7 @@
#include "loadsave.h" #include "loadsave.h"
#include "pack.h" #include "pack.h"
#include "pfile.h" #include "pfile.h"
#include "playerdat.hpp" #include "tables/playerdat.hpp"
#include "utils/endian_swap.hpp" #include "utils/endian_swap.hpp"
#include "utils/file_util.h" #include "utils/file_util.h"
#include "utils/paths.h" #include "utils/paths.h"

Write Preview
Loading…
Cancel
Save