Merge branch 'develop' into macos-develop

backwardsEric · Dec 2, 2024 · 83c73bf · 83c73bf
2 parents 6cf20eb + 2d9bf3e
commit 83c73bf
Show file tree

Hide file tree

Showing 139 changed files with 402 additions and 312 deletions.
diff --git a/VisualStudio/Hengband/Hengband.vcxproj b/VisualStudio/Hengband/Hengband.vcxproj
@@ -324,9 +324,11 @@
     <ClCompile Include="..\..\src\specific-object\stone-of-lore.cpp" />
     <ClCompile Include="..\..\src\spell-class\spells-mirror-master.cpp" />
     <ClCompile Include="..\..\src\system\angband-system.cpp" />
-    <ClCompile Include="..\..\src\system\dungeon-data-definition.cpp" />
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-data-definition.cpp" />
     <ClCompile Include="..\..\src\system\baseitem\baseitem-key.cpp" />
     <ClCompile Include="..\..\src\system\baseitem\baseitem-list.cpp" />
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-list.cpp" />
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-record.cpp" />
     <ClCompile Include="..\..\src\system\inner-game-data.cpp" />
     <ClCompile Include="..\..\src\system\redrawing-flags-updater.cpp" />
     <ClCompile Include="..\..\src\system\floor-type-definition.cpp" />
@@ -882,7 +884,7 @@
     <ClCompile Include="..\..\src\core\show-file.cpp" />
     <ClCompile Include="..\..\src\core\speed-table.cpp" />
     <ClCompile Include="..\..\src\info-reader\fixed-map-parser.cpp" />
-    <ClCompile Include="..\..\src\system\dungeon-info.cpp" />
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-definition.cpp" />
     <ClCompile Include="..\..\src\locale\english.cpp" />
     <ClCompile Include="..\..\src\grid\feature.cpp" />
     <ClCompile Include="..\..\src\floor\floor-events.cpp" />
@@ -1434,11 +1436,13 @@
     <ClInclude Include="..\..\src\system\angband-system.h" />
     <ClInclude Include="..\..\src\system\baseitem\baseitem-key.h" />
     <ClInclude Include="..\..\src\system\baseitem\baseitem-list.h" />
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-list.h" />
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-record.h" />
     <ClInclude Include="..\..\src\system\enums\grid-count-kind.h" />
     <ClInclude Include="..\..\src\system\enums\grid-flow.h" />
     <ClInclude Include="..\..\src\system\inner-game-data.h" />
     <ClInclude Include="..\..\src\system\redrawing-flags-updater.h" />
-    <ClInclude Include="..\..\src\system\dungeon-data-definition.h" />
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-data-definition.h" />
     <ClInclude Include="..\..\src\system\floor-type-definition.h" />
     <ClInclude Include="..\..\src\system\grid-type-definition.h" />
     <ClInclude Include="..\..\src\system\player-type-definition.h" />
@@ -1969,7 +1973,7 @@
     <ClInclude Include="..\..\src\system\system-variables.h" />
     <ClInclude Include="..\..\src\core\speed-table.h" />
     <ClInclude Include="..\..\src\info-reader\fixed-map-parser.h" />
-    <ClInclude Include="..\..\src\system\dungeon-info.h" />
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-definition.h" />
     <ClInclude Include="..\..\src\grid\feature.h" />
     <ClInclude Include="..\..\src\io\files-util.h" />
     <ClInclude Include="..\..\src\floor\floor-events.h" />

diff --git a/VisualStudio/Hengband/Hengband.vcxproj.filters b/VisualStudio/Hengband/Hengband.vcxproj.filters
@@ -2442,9 +2442,6 @@
     <ClCompile Include="..\..\src\system\floor-type-definition.cpp">
       <Filter>system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\system\dungeon-info.cpp">
-      <Filter>system</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\system\terrain-type-definition.cpp">
       <Filter>system</Filter>
     </ClCompile>
@@ -2523,9 +2520,6 @@
     <ClCompile Include="..\..\src\timed-effect\player-protection.cpp">
       <Filter>timed-effect</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\system\dungeon-data-definition.cpp">
-      <Filter>system</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\system\baseitem\baseitem-definition.cpp">
       <Filter>system\baseitem</Filter>
     </ClCompile>
@@ -2538,6 +2532,18 @@
     <ClCompile Include="..\..\src\system\services\baseitem-monrace-service.cpp">
       <Filter>system\services</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-definition.cpp">
+      <Filter>system\dungeon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-data-definition.cpp">
+      <Filter>system\dungeon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-record.cpp">
+      <Filter>system\dungeon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\system\dungeon\dungeon-list.cpp">
+      <Filter>system\dungeon</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -4502,9 +4508,6 @@
     <ClInclude Include="..\..\src\room\room-generator.h">
       <Filter>room</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\system\dungeon-data-definition.h">
-      <Filter>system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\room\treasure-deployment.h">
       <Filter>room</Filter>
     </ClInclude>
@@ -5373,9 +5376,6 @@
     <ClInclude Include="..\..\src\system\spell-info-list.h">
       <Filter>system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\system\dungeon-info.h">
-      <Filter>system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\system\terrain-type-definition.h">
       <Filter>system</Filter>
     </ClInclude>
@@ -5496,6 +5496,18 @@
     <ClInclude Include="..\..\src\system\services\baseitem-monrace-service.h">
       <Filter>system\services</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-definition.h">
+      <Filter>system\dungeon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-data-definition.h">
+      <Filter>system\dungeon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-record.h">
+      <Filter>system\dungeon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\system\dungeon\dungeon-list.h">
+      <Filter>system\dungeon</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
@@ -5775,6 +5787,9 @@
     <Filter Include="system\services">
       <UniqueIdentifier>{0f6862b2-2ab3-4d92-abc2-09a28f3a17b4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="system\dungeon">
+      <UniqueIdentifier>{1894220d-5f9a-4d37-b853-abc0076e56bc}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -923,8 +923,6 @@ hengband_SOURCES = \
 	system/angband-version.cpp system/angband-version.h \
 	system/artifact-type-definition.cpp system/artifact-type-definition.h \
 	system/building-type-definition.cpp system/building-type-definition.h \
-	system/dungeon-data-definition.cpp system/dungeon-data-definition.h \
-	system/dungeon-info.cpp system/dungeon-info.h \
 	system/floor-type-definition.cpp system/floor-type-definition.h \
 	system/grid-type-definition.cpp system/grid-type-definition.h \
 	system/h-basic.h system/h-config.h \
@@ -944,6 +942,11 @@ hengband_SOURCES = \
 	system/baseitem/baseitem-key.cpp system/baseitem/baseitem-key.h \
 	system/baseitem/baseitem-list.cpp system/baseitem/baseitem-list.h \
 	\
+	system/dungeon/dungeon-data-definition.cpp system/dungeon/dungeon-data-definition.h \
+	system/dungeon/dungeon-definition.cpp system/dungeon/dungeon-definition.h \
+	system/dungeon/dungeon-list.cpp system/dungeon/dungeon-list.h \
+	system/dungeon/dungeon-record.cpp system/dungeon/dungeon-record.h \
+	\
 	system/enums/game-option-page.h \
 	system/enums/grid-flow.h \
 	system/enums/monrace/monrace-id.h \

diff --git a/src/action/action-limited.cpp b/src/action/action-limited.cpp
@@ -11,7 +11,7 @@
 #include "main/sound-of-music.h"
 #include "player-base/player-class.h"
 #include "player/player-status.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "term/screen-processor.h"

diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp
@@ -22,7 +22,7 @@
 #include "specific-object/chest.h"
 #include "status/bad-status-setter.h"
 #include "status/experience.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"

diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp
@@ -392,7 +392,7 @@ static std::string name_unnatural_random_artifact(PlayerType *player_ptr, ItemEn
     o_ptr->mark_as_known();
     o_ptr->ident |= IDENT_FULL_KNOWN;
     o_ptr->randart_name.reset();
-    (void)screen_object(player_ptr, o_ptr, 0L);
+    (void)screen_object(player_ptr, *o_ptr, 0L);
 
     auto wrap_name = [](const auto &name) {
         std::stringstream ss;

diff --git a/src/avatar/avatar-changer.cpp b/src/avatar/avatar-changer.cpp
@@ -10,7 +10,7 @@
 #include "monster-race/monster-kind-mask.h"
 #include "monster-race/race-ability-mask.h"
 #include "monster/monster-info.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/enums/monrace/monrace-id.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-entity.h"

diff --git a/src/birth/game-play-initializer.cpp b/src/birth/game-play-initializer.cpp
@@ -18,7 +18,9 @@
 #include "system/baseitem/baseitem-definition.h"
 #include "system/baseitem/baseitem-list.h"
 #include "system/building-type-definition.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
+#include "system/dungeon/dungeon-list.h"
+#include "system/dungeon/dungeon-record.h"
 #include "system/floor-type-definition.h"
 #include "system/inner-game-data.h"
 #include "system/item-entity.h"

diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp
@@ -40,7 +40,7 @@
 #include "player/special-defense-types.h"
 #include "status/action-setter.h"
 #include "system/angband-exceptions.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"

diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
@@ -32,7 +32,9 @@
 #include "spell-realm/spells-hex.h"
 #include "spell-realm/spells-song.h"
 #include "status/action-setter.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
+#include "system/dungeon/dungeon-list.h"
+#include "system/dungeon/dungeon-record.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/cmd-io/cmd-dump.cpp b/src/cmd-io/cmd-dump.cpp
@@ -27,7 +27,7 @@
 #include "player/player-status-flags.h"
 #include "player/player-status.h"
 #include "system/angband-system.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/inner-game-data.h"
 #include "system/player-type-definition.h"

diff --git a/src/cmd-item/cmd-item.cpp b/src/cmd-item/cmd-item.cpp
@@ -163,7 +163,7 @@ void do_cmd_observe(PlayerType *player_ptr)
 
     const auto item_name = describe_flavor(player_ptr, *o_ptr, 0);
     msg_format(_("%sを調べている...", "Examining %s..."), item_name.data());
-    if (!screen_object(player_ptr, o_ptr, SCROBJ_FORCE_DETAIL)) {
+    if (!screen_object(player_ptr, *o_ptr, SCROBJ_FORCE_DETAIL)) {
         msg_print(_("特に変わったところはないようだ。", "You see nothing special."));
     }
 }

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
@@ -47,7 +47,7 @@
 #include "spell-realm/spells-song.h"
 #include "status/action-setter.h"
 #include "system/angband-system.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/monster-race-info.h"

diff --git a/src/core/score-util.cpp b/src/core/score-util.cpp
@@ -1,5 +1,5 @@
 #include "core/score-util.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-record.h"
 #include "system/floor-type-definition.h"
 #include "system/player-type-definition.h"
 #include "util/angband-files.h"

diff --git a/src/dungeon/dungeon-processor.cpp b/src/dungeon/dungeon-processor.cpp
@@ -30,7 +30,8 @@
 #include "spell-realm/spells-song.h"
 #include "system/angband-system.h"
 #include "system/building-type-definition.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
+#include "system/dungeon/dungeon-record.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-info.h"
 #include "system/player-type-definition.h"

diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp
@@ -24,7 +24,7 @@
 #include "player/player-personality-types.h"
 #include "player/player-status.h"
 #include "system/artifact-type-definition.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h" // @todo 相互参照、将来的に削除する.
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"

diff --git a/src/effect/effect-feature.cpp b/src/effect/effect-feature.cpp
@@ -17,7 +17,7 @@
 #include "room/door-definition.h"
 #include "spell-class/spells-mirror-master.h"
 #include "system/angband-system.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"

diff --git a/src/floor/cave-generator.cpp b/src/floor/cave-generator.cpp
@@ -22,8 +22,8 @@
 #include "room/lake-types.h"
 #include "room/room-generator.h"
 #include "room/rooms-maze-vault.h"
-#include "system/dungeon-data-definition.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-data-definition.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/player-type-definition.h"
@@ -69,7 +69,7 @@ static void check_arena_floor(PlayerType *player_ptr, DungeonData *dd_ptr)
     }
 }
 
-static void place_cave_contents(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static void place_cave_contents(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
     if (floor_ptr->dun_level == 1) {
@@ -93,7 +93,7 @@ static void place_cave_contents(PlayerType *player_ptr, DungeonData *dd_ptr, dun
     }
 }
 
-static bool decide_tunnel_planned_site(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr, dt_type *dt_ptr, int i)
+static bool decide_tunnel_planned_site(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr, dt_type *dt_ptr, int i)
 {
     dd_ptr->tunn_n = 0;
     dd_ptr->wall_n = 0;
@@ -124,7 +124,7 @@ static void make_tunnels(PlayerType *player_ptr, DungeonData *dd_ptr)
     }
 }
 
-static void make_walls(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr, dt_type *dt_ptr)
+static void make_walls(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr, dt_type *dt_ptr)
 {
     for (size_t j = 0; j < dd_ptr->wall_n; j++) {
         Grid *g_ptr;
@@ -138,7 +138,7 @@ static void make_walls(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type
     }
 }
 
-static bool make_centers(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr, dt_type *dt_ptr)
+static bool make_centers(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr, dt_type *dt_ptr)
 {
     dd_ptr->tunnel_fail_count = 0;
     dd_ptr->door_n = 0;
@@ -177,7 +177,7 @@ static void make_only_tunnel_points(FloorType *floor_ptr, DungeonData *dd_ptr)
     }
 }
 
-static bool make_one_floor(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static bool make_one_floor(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
 
@@ -211,7 +211,7 @@ static bool make_one_floor(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_
     return true;
 }
 
-static bool switch_making_floor(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static bool switch_making_floor(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     if (d_ptr->flags.has(DungeonFeatureType::MAZE)) {
         auto *floor_ptr = player_ptr->current_floor_ptr;
@@ -236,7 +236,7 @@ static bool switch_making_floor(PlayerType *player_ptr, DungeonData *dd_ptr, dun
     return true;
 }
 
-static void make_aqua_streams(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static void make_aqua_streams(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     if (dd_ptr->laketype != 0) {
         return;
@@ -309,7 +309,7 @@ static bool check_place_necessary_objects(PlayerType *player_ptr, DungeonData *d
     return true;
 }
 
-static void decide_dungeon_data_allocation(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static void decide_dungeon_data_allocation(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     auto *floor_ptr = player_ptr->current_floor_ptr;
     dd_ptr->alloc_object_num = floor_ptr->dun_level / 3;
@@ -338,7 +338,7 @@ static void decide_dungeon_data_allocation(PlayerType *player_ptr, DungeonData *
     }
 }
 
-static bool allocate_dungeon_data(PlayerType *player_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static bool allocate_dungeon_data(PlayerType *player_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     dd_ptr->alloc_monster_num += randint1(8);
     for (dd_ptr->alloc_monster_num = dd_ptr->alloc_monster_num + dd_ptr->alloc_object_num; dd_ptr->alloc_monster_num > 0; dd_ptr->alloc_monster_num--) {
@@ -370,7 +370,7 @@ static bool allocate_dungeon_data(PlayerType *player_ptr, DungeonData *dd_ptr, d
     return false;
 }
 
-static void decide_grid_glowing(FloorType *floor_ptr, DungeonData *dd_ptr, dungeon_type *d_ptr)
+static void decide_grid_glowing(FloorType *floor_ptr, DungeonData *dd_ptr, DungeonDefinition *d_ptr)
 {
     constexpr auto chanle_wholly_dark = 5;
     auto is_empty_or_dark = dd_ptr->empty_level;

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
@@ -27,7 +27,7 @@
 #include "system/artifact-type-definition.h"
 #include "system/baseitem/baseitem-definition.h"
 #include "system/baseitem/baseitem-list.h"
-#include "system/dungeon-info.h"
+#include "system/dungeon/dungeon-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/grid-type-definition.h"
 #include "system/item-entity.h"