[Refactor] #3409 place_monster_aux() が意味不明すぎるのでシグネチャからplace_specific_monster() とし...

diff --git a/src/core/game-play.cpp b/src/core/game-play.cpp
index 6b01714..c05990a 100644 (file)
--- a/src/core/game-play.cpp
+++ b/src/core/game-play.cpp
@@ -317,7 +317,7 @@ static void init_riding_pet(PlayerType *player_ptr, bool new_game)
 
     MonsterRaceId pet_r_idx = pc.equals(PlayerClassType::CAVALRY) ? MonsterRaceId::HORSE : MonsterRaceId::YASE_HORSE;
     auto *r_ptr = &monraces_info[pet_r_idx];
-    place_monster_aux(player_ptr, 0, player_ptr->y, player_ptr->x - 1, pet_r_idx, (PM_FORCE_PET | PM_NO_KAGE));
+    place_specific_monster(player_ptr, 0, player_ptr->y, player_ptr->x - 1, pet_r_idx, (PM_FORCE_PET | PM_NO_KAGE));
     auto *m_ptr = &player_ptr->current_floor_ptr->m_list[hack_m_idx_ii];
     m_ptr->mspeed = r_ptr->speed;
     m_ptr->maxhp = r_ptr->hdice * (r_ptr->hside + 1) / 2;

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index 5b3495b..12f4e72 100644 (file)
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -85,7 +85,7 @@ static void process_fishing(PlayerType *player_ptr)
             POSITION y, x;
             y = player_ptr->y + ddy[player_ptr->fishing_dir];
             x = player_ptr->x + ddx[player_ptr->fishing_dir];
-            if (place_monster_aux(player_ptr, 0, y, x, r_idx, PM_NO_KAGE)) {
+            if (place_specific_monster(player_ptr, 0, y, x, r_idx, PM_NO_KAGE)) {
                 const auto m_name = monster_desc(player_ptr, &floor_ptr->m_list[floor_ptr->grid_array[y][x].m_idx], 0);
                 msg_print(_(format("%sが釣れた！", m_name.data()), "You have a good catch!"));
                 success = true;

diff --git a/src/dungeon/quest-monster-placer.cpp b/src/dungeon/quest-monster-placer.cpp
index 0100623..7c54edd 100644 (file)
--- a/src/dungeon/quest-monster-placer.cpp
+++ b/src/dungeon/quest-monster-placer.cpp
@@ -83,7 +83,7 @@ bool place_quest_monsters(PlayerType *player_ptr)
                     return false;
                 }
 
-                if (place_monster_aux(player_ptr, 0, y, x, quest.r_idx, mode)) {
+                if (place_specific_monster(player_ptr, 0, y, x, quest.r_idx, mode)) {
                     break;
                 } else {
                     continue;

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index 06c6364..76ed357 100644 (file)
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -115,7 +115,7 @@ static void parse_qtw_D(PlayerType *player_ptr, qtwg_type *qtwg_ptr, char *s)
         if (random & RANDOM_MONSTER) {
             floor_ptr->monster_level = floor_ptr->base_level + monster_index;
 
-            place_monster(player_ptr, *qtwg_ptr->y, *qtwg_ptr->x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_NO_QUEST));
+            place_random_monster(player_ptr, *qtwg_ptr->y, *qtwg_ptr->x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP | PM_NO_QUEST));
 
             floor_ptr->monster_level = floor_ptr->base_level;
         } else if (monster_index) {
@@ -142,7 +142,7 @@ static void parse_qtw_D(PlayerType *player_ptr, qtwg_type *qtwg_ptr, char *s)
                 }
             }
 
-            place_monster_aux(player_ptr, 0, *qtwg_ptr->y, *qtwg_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_NO_KAGE));
+            place_specific_monster(player_ptr, 0, *qtwg_ptr->y, *qtwg_ptr->x, r_idx, (PM_ALLOW_SLEEP | PM_NO_KAGE));
             if (clone) {
                 floor_ptr->m_list[hack_m_idx_ii].mflag2.set(MonsterConstantFlagType::CLONED);
                 r_ref.cur_num = old_cur_num;

diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp
index 4a034c4..500fec8 100644 (file)
--- a/src/floor/floor-generator.cpp
+++ b/src/floor/floor-generator.cpp
@@ -139,7 +139,7 @@ static void generate_challenge_arena(PlayerType *player_ptr)
 
     build_arena(player_ptr, &y, &x);
     player_place(player_ptr, y, x);
-    if (place_monster_aux(player_ptr, 0, player_ptr->y + 5, player_ptr->x, arena_info[player_ptr->arena_number].r_idx, PM_NO_KAGE | PM_NO_PET)) {
+    if (place_specific_monster(player_ptr, 0, player_ptr->y + 5, player_ptr->x, arena_info[player_ptr->arena_number].r_idx, PM_NO_KAGE | PM_NO_PET)) {
         return;
     }
 
@@ -238,7 +238,7 @@ static void generate_gambling_arena(PlayerType *player_ptr)
     build_battle(player_ptr, &y, &x);
     player_place(player_ptr, y, x);
     for (MONSTER_IDX i = 0; i < 4; i++) {
-        place_monster_aux(player_ptr, 0, player_ptr->y + 8 + (i / 2) * 4, player_ptr->x - 2 + (i % 2) * 4, battle_mon_list[i], (PM_NO_KAGE | PM_NO_PET));
+        place_specific_monster(player_ptr, 0, player_ptr->y + 8 + (i / 2) * 4, player_ptr->x - 2 + (i % 2) * 4, battle_mon_list[i], (PM_NO_KAGE | PM_NO_PET));
         set_friendly(&floor_ptr->m_list[floor_ptr->grid_array[player_ptr->y + 8 + (i / 2) * 4][player_ptr->x - 2 + (i % 2) * 4].m_idx]);
     }
 

diff --git a/src/monster-floor/monster-generator.cpp b/src/monster-floor/monster-generator.cpp
index 2dc3cda..9a120ce 100644 (file)
--- a/src/monster-floor/monster-generator.cpp
+++ b/src/monster-floor/monster-generator.cpp
@@ -155,7 +155,7 @@ bool multiply_monster(PlayerType *player_ptr, MONSTER_IDX m_idx, bool clone, BIT
         mode |= PM_NO_PET;
     }
 
-    if (!place_monster_aux(player_ptr, m_idx, y, x, m_ptr->r_idx, (mode | PM_NO_KAGE | PM_MULTIPLY))) {
+    if (!place_specific_monster(player_ptr, m_idx, y, x, m_ptr->r_idx, (mode | PM_NO_KAGE | PM_MULTIPLY))) {
         return false;
     }
 
@@ -281,7 +281,7 @@ static bool place_monster_can_escort(PlayerType *player_ptr, MonsterRaceId r_idx
 }
 
 /*!
- * @brief 一般的なモンスター生成処理のサブルーチン / Attempt to place a monster of the given race at the given location
+ * @brief 特定モンスターを生成する
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param who 召喚主のモンスター情報ID
  * @param y 生成地点y座標
@@ -289,8 +289,9 @@ static bool place_monster_can_escort(PlayerType *player_ptr, MonsterRaceId r_idx
  * @param r_idx 生成するモンスターの種族ID
  * @param mode 生成オプション
  * @return 生成に成功したらtrue
+ * @details 護衛も一緒に生成する
  */
-bool place_monster_aux(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MonsterRaceId r_idx, BIT_FLAGS mode)
+bool place_specific_monster(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MonsterRaceId r_idx, BIT_FLAGS mode)
 {
     auto *r_ptr = &monraces_info[r_idx];
 
@@ -362,14 +363,14 @@ bool place_monster_aux(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSI
 }
 
 /*!
- * @brief 一般的なモンスター生成処理のメインルーチン / Attempt to place a monster of the given race at the given location
+ * @brief フロア相当のモンスターを1体生成する
  * @param player_ptr プレイヤーへの参照ポインタ
  * @param y 生成地点y座標
  * @param x 生成地点x座標
  * @param mode 生成オプション
  * @return 生成に成功したらtrue
  */
-bool place_monster(PlayerType *player_ptr, POSITION y, POSITION x, BIT_FLAGS mode)
+bool place_random_monster(PlayerType *player_ptr, POSITION y, POSITION x, BIT_FLAGS mode)
 {
     get_mon_num_prep(player_ptr, get_monster_hook(player_ptr), get_monster_hook2(player_ptr, y, x));
     MonsterRaceId r_idx;
@@ -385,7 +386,7 @@ bool place_monster(PlayerType *player_ptr, POSITION y, POSITION x, BIT_FLAGS mod
         mode |= PM_JURAL;
     }
 
-    return place_monster_aux(player_ptr, 0, y, x, r_idx, mode);
+    return place_specific_monster(player_ptr, 0, y, x, r_idx, mode);
 }
 
 static std::optional<MonsterRaceId> select_horde_leader_r_idx(PlayerType *player_ptr)
@@ -433,7 +434,7 @@ bool alloc_horde(PlayerType *player_ptr, POSITION y, POSITION x, summon_specific
             return false;
         }
 
-        if (place_monster_aux(player_ptr, 0, y, x, r_idx.value(), 0L)) {
+        if (place_specific_monster(player_ptr, 0, y, x, r_idx.value(), 0L)) {
             break;
         }
     }
@@ -496,7 +497,7 @@ bool alloc_guardian(PlayerType *player_ptr, bool def_val)
             continue;
         }
 
-        if (place_monster_aux(player_ptr, 0, oy, ox, guardian, (PM_ALLOW_GROUP | PM_NO_KAGE | PM_NO_PET))) {
+        if (place_specific_monster(player_ptr, 0, oy, ox, guardian, (PM_ALLOW_GROUP | PM_NO_KAGE | PM_NO_PET))) {
             return true;
         }
 
@@ -557,7 +558,7 @@ bool alloc_monster(PlayerType *player_ptr, POSITION dis, BIT_FLAGS mode, summon_
             return true;
         }
     } else {
-        if (place_monster(player_ptr, y, x, (mode | PM_ALLOW_GROUP))) {
+        if (place_random_monster(player_ptr, y, x, (mode | PM_ALLOW_GROUP))) {
             return true;
         }
     }

diff --git a/src/monster-floor/monster-generator.h b/src/monster-floor/monster-generator.h
index 7ce00d8..a10d6d9 100644 (file)
--- a/src/monster-floor/monster-generator.h
+++ b/src/monster-floor/monster-generator.h
@@ -9,8 +9,8 @@ typedef bool (*summon_specific_pf)(PlayerType *, MONSTER_IDX, POSITION, POSITION
 
 bool mon_scatter(PlayerType *player_ptr, MonsterRaceId r_idx, POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION max_dist);
 bool multiply_monster(PlayerType *player_ptr, MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode);
-bool place_monster_aux(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MonsterRaceId r_idx, BIT_FLAGS mode);
-bool place_monster(PlayerType *player_ptr, POSITION y, POSITION x, BIT_FLAGS mode);
+bool place_specific_monster(PlayerType *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MonsterRaceId r_idx, BIT_FLAGS mode);
+bool place_random_monster(PlayerType *player_ptr, POSITION y, POSITION x, BIT_FLAGS mode);
 bool alloc_horde(PlayerType *player_ptr, POSITION y, POSITION x, summon_specific_pf summon_specific);
 bool alloc_guardian(PlayerType *player_ptr, bool def_val);
 bool alloc_monster(PlayerType *player_ptr, POSITION dis, BIT_FLAGS mode, summon_specific_pf summon_specific);

diff --git a/src/monster-floor/monster-summon.cpp b/src/monster-floor/monster-summon.cpp
index dd91485..0475b94 100644 (file)
--- a/src/monster-floor/monster-summon.cpp
+++ b/src/monster-floor/monster-summon.cpp
@@ -155,7 +155,7 @@ bool summon_specific(PlayerType *player_ptr, MONSTER_IDX who, POSITION y1, POSIT
         mode |= PM_NO_KAGE;
     }
 
-    if (!place_monster_aux(player_ptr, who, y, x, r_idx, mode)) {
+    if (!place_specific_monster(player_ptr, who, y, x, r_idx, mode)) {
         summon_specific_type = SUMMON_NONE;
         return false;
     }
@@ -204,5 +204,5 @@ bool summon_named_creature(PlayerType *player_ptr, MONSTER_IDX who, POSITION oy,
         return false;
     }
 
-    return place_monster_aux(player_ptr, who, y, x, r_idx, (mode | PM_NO_KAGE));
+    return place_specific_monster(player_ptr, who, y, x, r_idx, (mode | PM_NO_KAGE));
 }

diff --git a/src/room/rooms-pit-nest.cpp b/src/room/rooms-pit-nest.cpp
index 3d93433..5a97aa3 100644 (file)
--- a/src/room/rooms-pit-nest.cpp
+++ b/src/room/rooms-pit-nest.cpp
@@ -381,7 +381,7 @@ bool build_type5(PlayerType *player_ptr, dun_data_type *dd_ptr)
             r_idx = nest_mon_info[i].r_idx;
 
             /* Place that "random" monster (no groups) */
-            (void)place_monster_aux(player_ptr, 0, y, x, r_idx, 0L);
+            (void)place_specific_monster(player_ptr, 0, y, x, r_idx, 0L);
 
             nest_mon_info[i].used = true;
         }
@@ -635,49 +635,49 @@ bool build_type6(PlayerType *player_ptr, dun_data_type *dd_ptr)
 
     /* Top and bottom rows */
     for (x = xval - 9; x <= xval + 9; x++) {
-        place_monster_aux(player_ptr, 0, yval - 2, x, what[0], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, yval + 2, x, what[0], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, yval - 2, x, what[0], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, yval + 2, x, what[0], PM_NO_KAGE);
     }
 
     /* Middle columns */
     for (y = yval - 1; y <= yval + 1; y++) {
-        place_monster_aux(player_ptr, 0, y, xval - 9, what[0], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 9, what[0], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 9, what[0], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 9, what[0], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 8, what[1], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 8, what[1], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 8, what[1], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 8, what[1], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 7, what[1], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 7, what[1], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 7, what[1], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 7, what[1], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 6, what[2], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 6, what[2], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 6, what[2], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 6, what[2], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 5, what[2], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 5, what[2], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 5, what[2], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 5, what[2], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 4, what[3], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 4, what[3], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 4, what[3], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 4, what[3], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 3, what[3], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 3, what[3], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 3, what[3], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 3, what[3], PM_NO_KAGE);
 
-        place_monster_aux(player_ptr, 0, y, xval - 2, what[4], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, y, xval + 2, what[4], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval - 2, what[4], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, xval + 2, what[4], PM_NO_KAGE);
     }
 
     /* Above/Below the center monster */
     for (x = xval - 1; x <= xval + 1; x++) {
-        place_monster_aux(player_ptr, 0, yval + 1, x, what[5], PM_NO_KAGE);
-        place_monster_aux(player_ptr, 0, yval - 1, x, what[5], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, yval + 1, x, what[5], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, yval - 1, x, what[5], PM_NO_KAGE);
     }
 
     /* Next to the center monster */
-    place_monster_aux(player_ptr, 0, yval, xval + 1, what[6], PM_NO_KAGE);
-    place_monster_aux(player_ptr, 0, yval, xval - 1, what[6], PM_NO_KAGE);
+    place_specific_monster(player_ptr, 0, yval, xval + 1, what[6], PM_NO_KAGE);
+    place_specific_monster(player_ptr, 0, yval, xval - 1, what[6], PM_NO_KAGE);
 
     /* Center monster */
-    place_monster_aux(player_ptr, 0, yval, xval, what[7], PM_NO_KAGE);
+    place_specific_monster(player_ptr, 0, yval, xval, what[7], PM_NO_KAGE);
 
     return true;
 }
@@ -970,7 +970,7 @@ bool build_type13(PlayerType *player_ptr, dun_data_type *dd_ptr)
     for (i = 0; place_table_trapped_pit[i][2] >= 0; i++) {
         y = yval + place_table_trapped_pit[i][0];
         x = xval + place_table_trapped_pit[i][1];
-        place_monster_aux(player_ptr, 0, y, x, what[place_table_trapped_pit[i][2]], PM_NO_KAGE);
+        place_specific_monster(player_ptr, 0, y, x, what[place_table_trapped_pit[i][2]], PM_NO_KAGE);
     }
 
     return true;

diff --git a/src/room/rooms-special.cpp b/src/room/rooms-special.cpp
index f89ac3d..f73cfbc 100644 (file)
--- a/src/room/rooms-special.cpp
+++ b/src/room/rooms-special.cpp
@@ -100,7 +100,7 @@ bool build_type15(PlayerType *player_ptr, dun_data_type *dd_ptr)
             y = yval + 2 * ddy_ddd[dir1];
             x = xval + 2 * ddx_ddd[dir1];
             if (MonsterRace(r_idx).is_valid()) {
-                place_monster_aux(player_ptr, 0, y, x, r_idx, PM_ALLOW_SLEEP);
+                place_specific_monster(player_ptr, 0, y, x, r_idx, PM_ALLOW_SLEEP);
             }
 
             /* Walls around the breather */
@@ -162,7 +162,7 @@ bool build_type15(PlayerType *player_ptr, dun_data_type *dd_ptr)
 
         r_idx = get_mon_num(player_ptr, 0, floor_ptr->dun_level, 0);
         if (MonsterRace(r_idx).is_valid()) {
-            place_monster_aux(player_ptr, 0, yval, xval, r_idx, 0L);
+            place_specific_monster(player_ptr, 0, yval, xval, r_idx, 0L);
         }
 
         /* Walls around the breather */
@@ -226,7 +226,7 @@ bool build_type15(PlayerType *player_ptr, dun_data_type *dd_ptr)
             y = yval + ddy_ddd[dir1];
             x = xval + ddx_ddd[dir1];
             if (MonsterRace(r_idx).is_valid()) {
-                place_monster_aux(player_ptr, 0, y, x, r_idx, 0L);
+                place_specific_monster(player_ptr, 0, y, x, r_idx, 0L);
             }
         }
 

diff --git a/src/room/rooms-vault.cpp b/src/room/rooms-vault.cpp
index 7fb9820..fa757b8 100644 (file)
--- a/src/room/rooms-vault.cpp
+++ b/src/room/rooms-vault.cpp
@@ -550,7 +550,7 @@ static void build_vault(
             switch (*t) {
             case '&': {
                 floor_ptr->monster_level = floor_ptr->base_level + 5;
-                place_monster(player_ptr, y, x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
+                place_random_monster(player_ptr, y, x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
                 floor_ptr->monster_level = floor_ptr->base_level;
                 break;
             }
@@ -558,7 +558,7 @@ static void build_vault(
             /* Meaner monster */
             case '@': {
                 floor_ptr->monster_level = floor_ptr->base_level + 11;
-                place_monster(player_ptr, y, x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
+                place_random_monster(player_ptr, y, x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
                 floor_ptr->monster_level = floor_ptr->base_level;
                 break;
             }
@@ -566,7 +566,7 @@ static void build_vault(
             /* Meaner monster, plus treasure */
             case '9': {
                 floor_ptr->monster_level = floor_ptr->base_level + 9;
-                place_monster(player_ptr, y, x, PM_ALLOW_SLEEP);
+                place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP);
                 floor_ptr->monster_level = floor_ptr->base_level;
                 floor_ptr->object_level = floor_ptr->base_level + 7;
                 place_object(player_ptr, y, x, AM_GOOD);
@@ -577,7 +577,7 @@ static void build_vault(
             /* Nasty monster and treasure */
             case '8': {
                 floor_ptr->monster_level = floor_ptr->base_level + 40;
-                place_monster(player_ptr, y, x, PM_ALLOW_SLEEP);
+                place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP);
                 floor_ptr->monster_level = floor_ptr->base_level;
                 floor_ptr->object_level = floor_ptr->base_level + 20;
                 place_object(player_ptr, y, x, AM_GOOD | AM_GREAT);
@@ -589,7 +589,7 @@ static void build_vault(
             case ',': {
                 if (randint0(100) < 50) {
                     floor_ptr->monster_level = floor_ptr->base_level + 3;
-                    place_monster(player_ptr, y, x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
+                    place_random_monster(player_ptr, y, x, (PM_ALLOW_SLEEP | PM_ALLOW_GROUP));
                     floor_ptr->monster_level = floor_ptr->base_level;
                 }
                 if (randint0(100) < 50) {

diff --git a/src/room/treasure-deployment.cpp b/src/room/treasure-deployment.cpp
index 84515dc..a2dd6fd 100644 (file)
--- a/src/room/treasure-deployment.cpp
+++ b/src/room/treasure-deployment.cpp
@@ -39,21 +39,21 @@ void fill_treasure(PlayerType *player_ptr, POSITION x1, POSITION x2, POSITION y1
 
             if (value < 0) {
                 floor_ptr->monster_level = floor_ptr->base_level + 40;
-                place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+                place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
                 floor_ptr->monster_level = floor_ptr->base_level;
                 floor_ptr->object_level = floor_ptr->base_level + 20;
                 place_object(player_ptr, y, x, AM_GOOD);
                 floor_ptr->object_level = floor_ptr->base_level;
             } else if (value < 5) {
                 floor_ptr->monster_level = floor_ptr->base_level + 20;
-                place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+                place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
                 floor_ptr->monster_level = floor_ptr->base_level;
                 floor_ptr->object_level = floor_ptr->base_level + 10;
                 place_object(player_ptr, y, x, AM_GOOD);
                 floor_ptr->object_level = floor_ptr->base_level;
             } else if (value < 10) {
                 floor_ptr->monster_level = floor_ptr->base_level + 9;
-                place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+                place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
                 floor_ptr->monster_level = floor_ptr->base_level;
             } else if (value < 17) {
             } else if (value < 23) {
@@ -64,13 +64,13 @@ void fill_treasure(PlayerType *player_ptr, POSITION x1, POSITION x2, POSITION y1
                 }
             } else if (value < 30) {
                 floor_ptr->monster_level = floor_ptr->base_level + 5;
-                place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+                place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
                 floor_ptr->monster_level = floor_ptr->base_level;
                 place_trap(player_ptr, y, x);
             } else if (value < 40) {
                 if (randint0(100) < 50) {
                     floor_ptr->monster_level = floor_ptr->base_level + 3;
-                    place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+                    place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
                     floor_ptr->monster_level = floor_ptr->base_level;
                 }
 
@@ -83,7 +83,7 @@ void fill_treasure(PlayerType *player_ptr, POSITION x1, POSITION x2, POSITION y1
                 place_trap(player_ptr, y, x);
             } else {
                 if (randint0(100) < 20) {
-                    place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+                    place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
                 } else if (randint0(100) < 50) {
                     place_trap(player_ptr, y, x);
                 } else if (randint0(100) < 50) {

diff --git a/src/room/vault-builder.cpp b/src/room/vault-builder.cpp
index fa626d3..62e9d21 100644 (file)
--- a/src/room/vault-builder.cpp
+++ b/src/room/vault-builder.cpp
@@ -56,7 +56,7 @@ void vault_monsters(PlayerType *player_ptr, POSITION y1, POSITION x1, int num)
             }
 
             floor_ptr->monster_level = floor_ptr->base_level + 2;
-            (void)place_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
+            (void)place_random_monster(player_ptr, y, x, PM_ALLOW_SLEEP | PM_ALLOW_GROUP);
             floor_ptr->monster_level = floor_ptr->base_level;
         }
     }

diff --git a/src/specific-object/monster-ball.cpp b/src/specific-object/monster-ball.cpp
index 960c749..7177105 100644 (file)
--- a/src/specific-object/monster-ball.cpp
+++ b/src/specific-object/monster-ball.cpp
@@ -100,7 +100,7 @@ static bool release_monster(PlayerType *player_ptr, ItemEntity &item, DIRECTION
         return false;
     }
 
-    if (!place_monster_aux(player_ptr, 0, player_ptr->y + ddy[dir], player_ptr->x + ddx[dir], r_idx, PM_FORCE_PET | PM_NO_KAGE)) {
+    if (!place_specific_monster(player_ptr, 0, player_ptr->y + ddy[dir], player_ptr->x + ddx[dir], r_idx, PM_FORCE_PET | PM_NO_KAGE)) {
         return false;
     }
 

diff --git a/src/spell-kind/spells-polymorph.cpp b/src/spell-kind/spells-polymorph.cpp
index 899234d..541e2e1 100644 (file)
--- a/src/spell-kind/spells-polymorph.cpp
+++ b/src/spell-kind/spells-polymorph.cpp
@@ -107,13 +107,13 @@ bool polymorph_monster(PlayerType *player_ptr, POSITION y, POSITION x)
     m_ptr->hold_o_idx_list.clear();
     delete_monster_idx(player_ptr, g_ptr->m_idx);
     bool polymorphed = false;
-    if (place_monster_aux(player_ptr, 0, y, x, new_r_idx, mode)) {
+    if (place_specific_monster(player_ptr, 0, y, x, new_r_idx, mode)) {
         floor_ptr->m_list[hack_m_idx_ii].nickname = back_m.nickname;
         floor_ptr->m_list[hack_m_idx_ii].parent_m_idx = back_m.parent_m_idx;
         floor_ptr->m_list[hack_m_idx_ii].hold_o_idx_list = back_m.hold_o_idx_list;
         polymorphed = true;
     } else {
-        if (place_monster_aux(player_ptr, 0, y, x, old_r_idx, (mode | PM_NO_KAGE | PM_IGNORE_TERRAIN))) {
+        if (place_specific_monster(player_ptr, 0, y, x, old_r_idx, (mode | PM_NO_KAGE | PM_IGNORE_TERRAIN))) {
             floor_ptr->m_list[hack_m_idx_ii] = back_m;
             mproc_init(floor_ptr);
         } else {