[Refactor] #40399 Renamed delete_object() to delete_all_items_from_floor()

diff --git a/src/floor/floor-object.c b/src/floor/floor-object.c
index 2352d4f..f1282f2 100644 (file)
--- a/src/floor/floor-object.c
+++ b/src/floor/floor-object.c
@@ -139,14 +139,14 @@ bool make_gold(floor_type *floor_ptr, object_type *j_ptr)
 }
 
 /*!
- * @brief フロアにマスに落ちているオブジェクトを全て削除する / Deletes all objects at given location
+ * @brief フロア中のアイテムを全て削除する / Deletes all objects at given location
  * Delete a dungeon object
  * @param player_ptr プレーヤーへの参照ポインタ
  * @param y 削除したフロアマスのY座標
  * @param x 削除したフロアマスのX座標
  * @return なし
  */
-void delete_object(player_type *player_ptr, POSITION y, POSITION x)
+void delete_all_items_from_floor(player_type *player_ptr, POSITION y, POSITION x)
 {
     grid_type *g_ptr;
     OBJECT_IDX this_o_idx, next_o_idx = 0;

diff --git a/src/floor/floor-object.h b/src/floor/floor-object.h
index f8b9386..e7bc63c 100644 (file)
--- a/src/floor/floor-object.h
+++ b/src/floor/floor-object.h
@@ -4,4 +4,4 @@
 
 bool make_object(player_type *owner_ptr, object_type *j_ptr, BIT_FLAGS mode);
 bool make_gold(floor_type *floor_ptr, object_type *j_ptr);
-void delete_object(player_type *owner_ptr, POSITION y, POSITION x);
+void delete_all_items_from_floor(player_type *owner_ptr, POSITION y, POSITION x);

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 0228e6f..cb5440a 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -388,7 +388,7 @@ void build_streamer(player_type *player_ptr, FEAT_IDX feat, int chance)
                                        }
                                }
 
-                               delete_object(player_ptr, ty, tx);
+                               delete_all_items_from_floor(player_ptr, ty, tx);
                        }
 
                        /* Clear previous contents, add proper vein type */

diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c
index 6b8fe3b..d7f12ef 100644 (file)
--- a/src/spell/spells-floor.c
+++ b/src/spell/spells-floor.c
@@ -292,7 +292,7 @@ void stair_creation(player_type *caster_ptr)
        }
 
        /* Destroy all objects in the grid */
-       delete_object(caster_ptr, caster_ptr->y, caster_ptr->x);
+       delete_all_items_from_floor(caster_ptr, caster_ptr->y, caster_ptr->x);
 
        /* Extract current floor data */
        saved_floor_type *sf_ptr;
@@ -572,7 +572,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r,
                                }
                        }
 
-                       delete_object(caster_ptr, y, x);
+                       delete_all_items_from_floor(caster_ptr, y, x);
 
                        /* Destroy "non-permanent" grids */
                        if (cave_perma_grid(g_ptr)) continue;
@@ -1053,7 +1053,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M
                        /* Destroy location (if valid) */
                        if (!cave_valid_bold(floor_ptr, yy, xx)) continue;
 
-                       delete_object(caster_ptr, yy, xx);
+                       delete_all_items_from_floor(caster_ptr, yy, xx);
 
                        /* Wall (or floor) type */
                        int t = cave_have_flag_bold(floor_ptr, yy, xx, FF_PROJECT) ? randint0(100) : 200;