Merge branch 'develop' into macos-develop

diff --cc src/Makefile.am
Simple merge

diff --cc src/view/display-map.cpp
index 673e000,ad91138..bfe8127
--- 1/src/view/display-map.cpp
--- 2/src/view/display-map.cpp
+++ b/src/view/display-map.cpp
@@@ -44,12 -44,13 +44,12 @@@ const std::string image_monsters = "abc
   * @brief オブジェクトの表示を幻覚状態に差し替える
   * @return 差し替えたシンボルと色
   */
- ColoredChar image_object()
+ DisplaySymbol image_object()
  {
      if (use_graphics) {
 -        auto &baseitems = BaseitemList::get_instance();
 -        const std::span<BaseitemInfo> candidates(baseitems.begin() + 1, baseitems.end());
 -        const auto &baseitem = rand_choice(candidates);
 +        const auto &baseitems = BaseitemList::get_instance();
 +        const auto &baseitem = *(baseitems.begin() + randint1(baseitems.size() - 1));
-         return baseitem.cc_config;
+         return baseitem.symbol_config;
      }
  
      return { randnum1<uint8_t>(15), rand_choice(image_objects) };