[Refactor] #1003 object_wipe() をwipe() に、object_prep() をprep() に、object_copy() をcopy_...

diff --git a/src/action/weapon-shield.cpp b/src/action/weapon-shield.cpp
index 3c39162..f9d2888 100644 (file)
--- a/src/action/weapon-shield.cpp
+++ b/src/action/weapon-shield.cpp
@@ -40,7 +40,7 @@ void verify_equip_slot(player_type *owner_ptr, INVENTORY_IDX item)
         }
 
         new_o_ptr = &owner_ptr->inventory_list[INVEN_MAIN_HAND];
-        new_o_ptr->object_copy(o_ptr);
+        new_o_ptr->copy_from(o_ptr);
         inven_item_increase(owner_ptr, INVEN_SUB_HAND, -((int)o_ptr->number));
         inven_item_optimize(owner_ptr, INVEN_SUB_HAND);
         if (object_allow_two_hands_wielding(o_ptr) && can_two_hands_wielding(owner_ptr))
@@ -68,7 +68,7 @@ void verify_equip_slot(player_type *owner_ptr, INVENTORY_IDX item)
         return;
 
     new_o_ptr = &owner_ptr->inventory_list[INVEN_SUB_HAND];
-    new_o_ptr->object_copy(o_ptr);
+    new_o_ptr->copy_from(o_ptr);
     inven_item_increase(owner_ptr, INVEN_MAIN_HAND, -((int)o_ptr->number));
     inven_item_optimize(owner_ptr, INVEN_MAIN_HAND);
     msg_format(_("%sを持ち替えた。", "You switched hand of %s."), o_name);

diff --git a/src/artifact/fixed-art-generator.cpp b/src/artifact/fixed-art-generator.cpp
index 3e8a90b..b0213bc 100644 (file)
--- a/src/artifact/fixed-art-generator.cpp
+++ b/src/artifact/fixed-art-generator.cpp
@@ -246,7 +246,7 @@ bool create_named_art(player_type *player_ptr, ARTIFACT_IDX a_idx, POSITION y, P
 
     object_type forge;
     auto q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, i);
+    q_ptr->prep(player_ptr, i);
     q_ptr->name1 = a_idx;
 
     (void)apply_artifact(player_ptr, q_ptr);
@@ -377,7 +377,7 @@ bool make_artifact_special(player_type *player_ptr, object_type *o_ptr)
 
         /*! @note 前述の条件を満たしたら、後のIDのアーティファクトはチェックせずすぐ確定し生成処理に移す /
          * Assign the template. Mega-Hack -- mark the item as an artifact. Hack: Some artifacts get random extra powers. Success. */
-        o_ptr->object_prep(player_ptr, k_idx);
+        o_ptr->prep(player_ptr, k_idx);
 
         o_ptr->name1 = i;
         return true;

diff --git a/src/birth/game-play-initializer.cpp b/src/birth/game-play-initializer.cpp
index 8e30f45..0c82b86 100644 (file)
--- a/src/birth/game-play-initializer.cpp
+++ b/src/birth/game-play-initializer.cpp
@@ -77,7 +77,7 @@ void player_wipe_without_name(player_type *creature_ptr)
     creature_ptr->inven_cnt = 0;
     creature_ptr->equip_cnt = 0;
     for (int i = 0; i < INVEN_TOTAL; i++)
-        (&creature_ptr->inventory_list[i])->object_wipe();
+        (&creature_ptr->inventory_list[i])->wipe();
 
     for (int i = 0; i < max_a_idx; i++) {
         artifact_type *a_ptr = &a_info[i];

diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp
index a153576..2a05957 100644 (file)
--- a/src/birth/inventory-initializer.cpp
+++ b/src/birth/inventory-initializer.cpp
@@ -52,7 +52,7 @@ void wield_all(player_type *creature_ptr)
 
         object_type *i_ptr;
         i_ptr = &object_type_body;
-        i_ptr->object_copy(o_ptr);
+        i_ptr->copy_from(o_ptr);
         i_ptr->number = 1;
 
         if (item >= 0) {
@@ -64,7 +64,7 @@ void wield_all(player_type *creature_ptr)
         }
 
         o_ptr = &creature_ptr->inventory_list[slot];
-        o_ptr->object_copy(i_ptr);
+        o_ptr->copy_from(i_ptr);
         creature_ptr->equip_cnt++;
     }
 }
@@ -94,7 +94,7 @@ static void decide_initial_items(player_type *creature_ptr, object_type *q_ptr)
         /* Demon can drain vitality from humanoid corpse */
         get_mon_num_prep(creature_ptr, monster_hook_human, NULL);
         for (int i = rand_range(3, 4); i > 0; i--) {
-            q_ptr->object_prep(creature_ptr, lookup_kind(TV_CORPSE, SV_CORPSE));
+            q_ptr->prep(creature_ptr, lookup_kind(TV_CORPSE, SV_CORPSE));
             q_ptr->pval = get_mon_num(creature_ptr, 0, 2, 0);
             if (q_ptr->pval) {
                 q_ptr->number = 1;
@@ -108,26 +108,26 @@ static void decide_initial_items(player_type *creature_ptr, object_type *q_ptr)
     case RACE_ZOMBIE:
     case RACE_SPECTRE:
         /* Staff (of Nothing) */
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_STAFF, SV_STAFF_NOTHING));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_STAFF, SV_STAFF_NOTHING));
         q_ptr->number = 1;
         add_outfit(creature_ptr, q_ptr);
         break;
     case RACE_ENT:
         /* Potions of Water */
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_POTION, SV_POTION_WATER));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_POTION, SV_POTION_WATER));
         q_ptr->number = (ITEM_NUMBER)rand_range(15, 23);
         add_outfit(creature_ptr, q_ptr);
         break;
     case RACE_ANDROID:
         /* Flasks of oil */
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FLASK, SV_ANY));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FLASK, SV_ANY));
         apply_magic_to_object(creature_ptr, q_ptr, 1, AM_NO_FIXED_ART);
         q_ptr->number = (ITEM_NUMBER)rand_range(7, 12);
         add_outfit(creature_ptr, q_ptr);
         break;
     default:
         /* Food rations */
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
         q_ptr->number = (ITEM_NUMBER)rand_range(3, 7);
         add_outfit(creature_ptr, q_ptr);
     }
@@ -147,11 +147,11 @@ void player_outfit(player_type *creature_ptr)
     q_ptr = &forge;
 
     if ((creature_ptr->prace == RACE_VAMPIRE) && (creature_ptr->pclass != CLASS_NINJA)) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_SCROLL, SV_SCROLL_DARKNESS));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_SCROLL, SV_SCROLL_DARKNESS));
         q_ptr->number = (ITEM_NUMBER)rand_range(2, 5);
         add_outfit(creature_ptr, q_ptr);
     } else if (creature_ptr->pclass != CLASS_NINJA) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_LITE, SV_LITE_TORCH));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_LITE, SV_LITE_TORCH));
         q_ptr->number = (ITEM_NUMBER)rand_range(3, 7);
         q_ptr->xtra4 = rand_range(3, 7) * 500;
 
@@ -160,73 +160,73 @@ void player_outfit(player_type *creature_ptr)
 
     q_ptr = &forge;
     if (creature_ptr->prace == RACE_MERFOLK) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_RING, SV_RING_LEVITATION_FALL));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_RING, SV_RING_LEVITATION_FALL));
         q_ptr->number = 1;
         add_outfit(creature_ptr, q_ptr);
     }
 
     if ((creature_ptr->pclass == CLASS_RANGER) || (creature_ptr->pclass == CLASS_CAVALRY)) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_ARROW, SV_AMMO_NORMAL));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_ARROW, SV_AMMO_NORMAL));
         q_ptr->number = (byte)rand_range(15, 20);
         add_outfit(creature_ptr, q_ptr);
     }
 
     if (creature_ptr->pclass == CLASS_RANGER) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_BOW, SV_SHORT_BOW));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_BOW, SV_SHORT_BOW));
         add_outfit(creature_ptr, q_ptr);
     } else if (creature_ptr->pclass == CLASS_ARCHER) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_ARROW, SV_AMMO_NORMAL));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_ARROW, SV_AMMO_NORMAL));
         q_ptr->number = (ITEM_NUMBER)rand_range(15, 20);
         add_outfit(creature_ptr, q_ptr);
     } else if (creature_ptr->pclass == CLASS_HIGH_MAGE || creature_ptr->pclass == CLASS_ELEMENTALIST) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_WAND, SV_WAND_MAGIC_MISSILE));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_WAND, SV_WAND_MAGIC_MISSILE));
         q_ptr->number = 1;
         q_ptr->pval = (PARAMETER_VALUE)rand_range(25, 30);
         add_outfit(creature_ptr, q_ptr);
     } else if (creature_ptr->pclass == CLASS_SORCERER) {
         int book_tval;
         for (book_tval = TV_LIFE_BOOK; book_tval <= TV_LIFE_BOOK + static_cast<int>(MAX_MAGIC) - 1; book_tval++) {
-            q_ptr->object_prep(creature_ptr, lookup_kind(static_cast<tval_type>(book_tval), 0));
+            q_ptr->prep(creature_ptr, lookup_kind(static_cast<tval_type>(book_tval), 0));
             q_ptr->number = 1;
             add_outfit(creature_ptr, q_ptr);
         }
     } else if (creature_ptr->pclass == CLASS_TOURIST) {
         if (creature_ptr->pseikaku != PERSONALITY_SEXY) {
-            q_ptr->object_prep(creature_ptr, lookup_kind(TV_SHOT, SV_AMMO_LIGHT));
+            q_ptr->prep(creature_ptr, lookup_kind(TV_SHOT, SV_AMMO_LIGHT));
             q_ptr->number = rand_range(15, 20);
             add_outfit(creature_ptr, q_ptr);
         }
 
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_BISCUIT));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_BISCUIT));
         q_ptr->number = rand_range(2, 4);
 
         add_outfit(creature_ptr, q_ptr);
 
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_WAYBREAD));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_WAYBREAD));
         q_ptr->number = rand_range(2, 4);
 
         add_outfit(creature_ptr, q_ptr);
 
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_JERKY));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_JERKY));
         q_ptr->number = rand_range(1, 3);
 
         add_outfit(creature_ptr, q_ptr);
 
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_PINT_OF_ALE));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_PINT_OF_ALE));
         q_ptr->number = rand_range(2, 4);
 
         add_outfit(creature_ptr, q_ptr);
 
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_PINT_OF_WINE));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_PINT_OF_WINE));
         q_ptr->number = rand_range(2, 4);
 
         add_outfit(creature_ptr, q_ptr);
     } else if (creature_ptr->pclass == CLASS_NINJA) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_SPIKE, 0));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_SPIKE, 0));
         q_ptr->number = rand_range(15, 20);
         add_outfit(creature_ptr, q_ptr);
     } else if (creature_ptr->pclass == CLASS_SNIPER) {
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_BOLT, SV_AMMO_NORMAL));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_BOLT, SV_AMMO_NORMAL));
         q_ptr->number = rand_range(15, 20);
         add_outfit(creature_ptr, q_ptr);
     }
@@ -259,7 +259,7 @@ void player_outfit(player_type *creature_ptr)
         }
 
         q_ptr = &forge;
-        q_ptr->object_prep(creature_ptr, lookup_kind(static_cast<tval_type>(tv), sv));
+        q_ptr->prep(creature_ptr, lookup_kind(static_cast<tval_type>(tv), sv));
         if ((tv == TV_SWORD || tv == TV_HAFTED)
             && (creature_ptr->pclass == CLASS_ROGUE && creature_ptr->realm1 == REALM_DEATH)) /* Only assassins get a poisoned weapon */
             q_ptr->name2 = EGO_BRAND_POIS;

diff --git a/src/cmd-item/cmd-destroy.cpp b/src/cmd-item/cmd-destroy.cpp
index 4bab100..ef358da 100644 (file)
--- a/src/cmd-item/cmd-destroy.cpp
+++ b/src/cmd-item/cmd-destroy.cpp
@@ -175,7 +175,7 @@ static void process_destroy_magic_book(player_type *creature_ptr, destroy_type *
 
 static void exe_destroy_item(player_type *creature_ptr, destroy_type *destroy_ptr)
 {
-    destroy_ptr->q_ptr->object_copy(destroy_ptr->o_ptr);
+    destroy_ptr->q_ptr->copy_from(destroy_ptr->o_ptr);
     msg_format(_("%sを壊した。", "You destroy %s."), destroy_ptr->o_name);
     sound(SOUND_DESTITEM);
     reduce_charges(destroy_ptr->o_ptr, destroy_ptr->amt);

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index d867f81..43c926d 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -223,7 +223,7 @@ bool exe_eat_charge_of_magic_device(player_type *creature_ptr, object_type *o_pt
             object_type forge;
             object_type *q_ptr;
             q_ptr = &forge;
-            q_ptr->object_copy(o_ptr);
+            q_ptr->copy_from(o_ptr);
 
             /* Modify quantity */
             q_ptr->number = 1;
@@ -328,7 +328,7 @@ void exe_eat_food(player_type *creature_ptr, INVENTORY_IDX item)
             object_type *q_ptr = &forge;
 
             msg_print(_("食べ物がアゴを素通りして落ちた！", "The food falls through your jaws!"));
-            q_ptr->object_prep(creature_ptr, lookup_kind(o_ptr->tval, o_ptr->sval));
+            q_ptr->prep(creature_ptr, lookup_kind(o_ptr->tval, o_ptr->sval));
 
             /* Drop the object from heaven */
             (void)drop_near(creature_ptr, q_ptr, -1, creature_ptr->y, creature_ptr->x);

diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index d1babd6..92af737 100644 (file)
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -213,9 +213,9 @@ void do_cmd_wield(player_type *creature_ptr)
         object_type *otmp_ptr = &object_tmp;
         GAME_TEXT switch_name[MAX_NLEN];
         describe_flavor(creature_ptr, switch_name, switch_o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-        otmp_ptr->object_copy(switch_o_ptr);
-        switch_o_ptr->object_copy(slot_o_ptr);
-        slot_o_ptr->object_copy(otmp_ptr);
+        otmp_ptr->copy_from(switch_o_ptr);
+        switch_o_ptr->copy_from(slot_o_ptr);
+        slot_o_ptr->copy_from(otmp_ptr);
         msg_format(_("%sを%sに構えなおした。", "You wield %s at %s hand."), switch_name,
             (slot == INVEN_MAIN_HAND) ? (left_hander ? _("左手", "left") : _("右手", "right")) : (left_hander ? _("右手", "right") : _("左手", "left")));
         slot = need_switch_wielding;
@@ -229,7 +229,7 @@ void do_cmd_wield(player_type *creature_ptr)
 
     PlayerEnergy(creature_ptr).set_player_turn_energy(100);
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
     q_ptr->number = 1;
     if (item >= 0) {
         inven_item_increase(creature_ptr, item, -1);
@@ -243,7 +243,7 @@ void do_cmd_wield(player_type *creature_ptr)
     if (o_ptr->k_idx)
         (void)inven_takeoff(creature_ptr, slot, 255);
 
-    o_ptr->object_copy(q_ptr);
+    o_ptr->copy_from(q_ptr);
     o_ptr->marked |= OM_TOUCHED;
     creature_ptr->equip_cnt++;
 

diff --git a/src/cmd-item/cmd-smith.cpp b/src/cmd-item/cmd-smith.cpp
index 2f1fdb0..33b0548 100644 (file)
--- a/src/cmd-item/cmd-smith.cpp
+++ b/src/cmd-item/cmd-smith.cpp
@@ -332,7 +332,7 @@ static void drain_essence(player_type *creature_ptr)
     marked = o_ptr->marked;
     number = o_ptr->number;
 
-    o_ptr->object_prep(creature_ptr, o_ptr->k_idx);
+    o_ptr->prep(creature_ptr, o_ptr->k_idx);
 
     o_ptr->iy = iy;
     o_ptr->ix = ix;

diff --git a/src/cmd-item/cmd-throw.cpp b/src/cmd-item/cmd-throw.cpp
index 76ba120..4ea9716 100644 (file)
--- a/src/cmd-item/cmd-throw.cpp
+++ b/src/cmd-item/cmd-throw.cpp
@@ -136,7 +136,7 @@ static bool check_can_throw(player_type *creature_ptr, it_type *it_ptr)
 
 static void calc_throw_range(player_type *creature_ptr, it_type *it_ptr)
 {
-    it_ptr->q_ptr->object_copy(it_ptr->o_ptr);
+    it_ptr->q_ptr->copy_from(it_ptr->o_ptr);
     object_flags(creature_ptr, it_ptr->q_ptr, it_ptr->obj_flags);
     torch_flags(it_ptr->q_ptr, it_ptr->obj_flags);
     distribute_charges(it_ptr->o_ptr, it_ptr->q_ptr, 1);
@@ -481,7 +481,7 @@ static void process_boomerang_back(player_type *creature_ptr, it_type *it_ptr)
         }
 
         it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item];
-        it_ptr->o_ptr->object_copy(it_ptr->q_ptr);
+        it_ptr->o_ptr->copy_from(it_ptr->q_ptr);
         creature_ptr->equip_cnt++;
         creature_ptr->update |= PU_BONUS | PU_TORCH | PU_MANA;
         creature_ptr->window_flags |= PW_EQUIP;

diff --git a/src/cmd-item/cmd-usestaff.cpp b/src/cmd-item/cmd-usestaff.cpp
index 57b5762..aaa16bb 100644 (file)
--- a/src/cmd-item/cmd-usestaff.cpp
+++ b/src/cmd-item/cmd-usestaff.cpp
@@ -401,7 +401,7 @@ void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item)
         object_type forge;
         object_type *q_ptr;
         q_ptr = &forge;
-        q_ptr->object_copy(o_ptr);
+        q_ptr->copy_from(o_ptr);
 
         /* Modify quantity */
         q_ptr->number = 1;

diff --git a/src/cmd-visual/cmd-visuals.cpp b/src/cmd-visual/cmd-visuals.cpp
index dbe88aa..2700243 100644 (file)
--- a/src/cmd-visual/cmd-visuals.cpp
+++ b/src/cmd-visual/cmd-visuals.cpp
@@ -154,7 +154,7 @@ void do_cmd_visuals(player_type *creature_ptr)
                     strip_name(o_name, k_idx);
                 } else {
                     object_type forge;
-                    (&forge)->object_prep(creature_ptr, k_idx);
+                    (&forge)->prep(creature_ptr, k_idx);
                     describe_flavor(creature_ptr, o_name, &forge, OD_FORCE_FLAVOR);
                 }
 

diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp
index 4e1d19e..2f4c867 100644 (file)
--- a/src/combat/shoot.cpp
+++ b/src/combat/shoot.cpp
@@ -506,7 +506,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr,
         y = shooter_ptr->y;
         x = shooter_ptr->x;
         q_ptr = &forge;
-        q_ptr->object_copy(o_ptr);
+        q_ptr->copy_from(o_ptr);
 
         /* Single object */
         q_ptr->number = 1;
@@ -851,7 +851,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr,
             }
 
             o_ptr = &shooter_ptr->current_floor_ptr->o_list[o_idx];
-            o_ptr->object_copy(q_ptr);
+            o_ptr->copy_from(q_ptr);
 
             /* Forget mark */
             reset_bits(o_ptr->marked, OM_TOUCHED);

diff --git a/src/core/object-compressor.cpp b/src/core/object-compressor.cpp
index 089e402..8e8a9ec 100644 (file)
--- a/src/core/object-compressor.cpp
+++ b/src/core/object-compressor.cpp
@@ -34,7 +34,7 @@ static void compact_objects_aux(floor_type *floor_ptr, OBJECT_IDX i1, OBJECT_IDX
 
     // 要素番号i1のオブジェクトを要素番号i2に移動
     floor_ptr->o_list[i2] = floor_ptr->o_list[i1];
-    o_ptr->object_wipe();
+    o_ptr->wipe();
 }
 
 /*!

diff --git a/src/dungeon/quest-completion-checker.cpp b/src/dungeon/quest-completion-checker.cpp
index f045aa6..eb5b527 100644 (file)
--- a/src/dungeon/quest-completion-checker.cpp
+++ b/src/dungeon/quest-completion-checker.cpp
@@ -172,7 +172,7 @@ void check_quest_completion(player_type *player_ptr, monster_type *m_ptr)
     object_type *o_ptr;
     for (int i = 0; i < (floor_ptr->dun_level / 15) + 1; i++) {
         o_ptr = &forge;
-        o_ptr->object_wipe();
+        o_ptr->wipe();
         make_object(player_ptr, o_ptr, AM_GOOD | AM_GREAT);
         (void)drop_near(player_ptr, o_ptr, -1, y, x);
     }

diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp
index c510d3f..d910440 100644 (file)
--- a/src/effect/effect-monster.cpp
+++ b/src/effect/effect-monster.cpp
@@ -590,7 +590,7 @@ static void postprocess_by_taking_photo(player_type *caster_ptr, effect_monster_
     object_type *q_ptr;
     object_type forge;
     q_ptr = &forge;
-    q_ptr->object_prep(caster_ptr, lookup_kind(TV_STATUE, SV_PHOTO));
+    q_ptr->prep(caster_ptr, lookup_kind(TV_STATUE, SV_PHOTO));
     q_ptr->pval = em_ptr->photo;
     q_ptr->ident |= (IDENT_FULL_KNOWN);
     (void)drop_near(caster_ptr, q_ptr, -1, caster_ptr->y, caster_ptr->x);

diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp
index 7cb3100..c6423a6 100644 (file)
--- a/src/floor/fixed-map-generator.cpp
+++ b/src/floor/fixed-map-generator.cpp
@@ -65,7 +65,7 @@ static void drop_here(floor_type *floor_ptr, object_type *j_ptr, POSITION y, POS
     OBJECT_IDX o_idx = o_pop(floor_ptr);
     object_type *o_ptr;
     o_ptr = &floor_ptr->o_list[o_idx];
-    o_ptr->object_copy(j_ptr);
+    o_ptr->copy_from(j_ptr);
     o_ptr->iy = y;
     o_ptr->ix = x;
     o_ptr->held_m_idx = 0;
@@ -86,7 +86,7 @@ static void generate_artifact(player_type *player_ptr, qtwg_type *qtwg_ptr, cons
     KIND_OBJECT_IDX k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, k_idx);
+    q_ptr->prep(player_ptr, k_idx);
     drop_here(player_ptr->current_floor_ptr, q_ptr, *qtwg_ptr->y, *qtwg_ptr->x);
 }
 
@@ -174,7 +174,7 @@ static void parse_qtw_D(player_type *player_ptr, qtwg_type *qtwg_ptr, char *s)
         } else if (object_index) {
             object_type tmp_object;
             object_type *o_ptr = &tmp_object;
-            o_ptr->object_prep(player_ptr, object_index);
+            o_ptr->prep(player_ptr, object_index);
             if (o_ptr->tval == TV_GOLD) {
                 coin_type = object_index - OBJ_GOLD_LIST;
                 make_gold(player_ptr, o_ptr);

diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp
index 4eec41c..7af0fcd 100644 (file)
--- a/src/floor/floor-object.cpp
+++ b/src/floor/floor-object.cpp
@@ -117,7 +117,7 @@ bool make_object(player_type *owner_ptr, object_type *j_ptr, BIT_FLAGS mode)
         if (!k_idx)
             return FALSE;
 
-        j_ptr->object_prep(owner_ptr, k_idx);
+        j_ptr->prep(owner_ptr, k_idx);
     }
 
     apply_magic_to_object(owner_ptr, j_ptr, floor_ptr->object_level, mode);
@@ -162,7 +162,7 @@ bool make_gold(player_type *player_ptr, object_type *j_ptr)
         i = coin_type;
     if (i >= MAX_GOLD)
         i = MAX_GOLD - 1;
-    j_ptr->object_prep(player_ptr, OBJ_GOLD_LIST + i);
+    j_ptr->prep(player_ptr, OBJ_GOLD_LIST + i);
 
     s32b base = k_info[OBJ_GOLD_LIST + i].cost;
     j_ptr->pval = (base + (8L * randint1(base)) + randint1(8));
@@ -188,7 +188,7 @@ void delete_all_items_from_floor(player_type *player_ptr, POSITION y, POSITION x
     for (const auto this_o_idx : g_ptr->o_idx_list) {
         object_type *o_ptr;
         o_ptr = &floor_ptr->o_list[this_o_idx];
-        o_ptr->object_wipe();
+        o_ptr->wipe();
         floor_ptr->o_cnt--;
     }
 
@@ -260,7 +260,7 @@ void delete_object_idx(player_type *player_ptr, OBJECT_IDX o_idx)
         lite_spot(player_ptr, y, x);
     }
 
-    j_ptr->object_wipe();
+    j_ptr->wipe();
     floor_ptr->o_cnt--;
 
     set_bits(player_ptr->window_flags, PW_FLOOR_ITEM_LIST);
@@ -506,7 +506,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan
     }
 
     if (!done) {
-        (&floor_ptr->o_list[o_idx])->object_copy(j_ptr);
+        (&floor_ptr->o_list[o_idx])->copy_from(j_ptr);
         j_ptr = &floor_ptr->o_list[o_idx];
         j_ptr->iy = by;
         j_ptr->ix = bx;

diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp
index e13afec..4b4ad37 100644 (file)
--- a/src/floor/floor-util.cpp
+++ b/src/floor/floor-util.cpp
@@ -133,7 +133,7 @@ void wipe_o_list(floor_type *floor_ptr)
 
         auto &list = get_o_idx_list_contains(floor_ptr, i);
         list.clear();
-        o_ptr->object_wipe();
+        o_ptr->wipe();
     }
 
     floor_ptr->o_max = 1;

diff --git a/src/grid/object-placer.cpp b/src/grid/object-placer.cpp
index c78c1e7..667005e 100644 (file)
--- a/src/grid/object-placer.cpp
+++ b/src/grid/object-placer.cpp
@@ -33,7 +33,7 @@ void place_gold(player_type *player_ptr, POSITION y, POSITION x)
     object_type forge;
     object_type *q_ptr;
     q_ptr = &forge;
-    q_ptr->object_wipe();
+    q_ptr->wipe();
     if (!make_gold(player_ptr, q_ptr))
         return;
 
@@ -43,7 +43,7 @@ void place_gold(player_type *player_ptr, POSITION y, POSITION x)
 
     object_type *o_ptr;
     o_ptr = &floor_ptr->o_list[o_idx];
-    o_ptr->object_copy(q_ptr);
+    o_ptr->copy_from(q_ptr);
 
     o_ptr->iy = y;
     o_ptr->ix = x;
@@ -76,7 +76,7 @@ void place_object(player_type *owner_ptr, POSITION y, POSITION x, BIT_FLAGS mode
         return;
 
     q_ptr = &forge;
-    q_ptr->object_wipe();
+    q_ptr->wipe();
     if (!make_object(owner_ptr, q_ptr, mode))
         return;
 
@@ -91,7 +91,7 @@ void place_object(player_type *owner_ptr, POSITION y, POSITION x, BIT_FLAGS mode
 
     object_type *o_ptr;
     o_ptr = &floor_ptr->o_list[o_idx];
-    o_ptr->object_copy(q_ptr);
+    o_ptr->copy_from(q_ptr);
 
     o_ptr->iy = y;
     o_ptr->ix = x;

diff --git a/src/inventory/inventory-object.cpp b/src/inventory/inventory-object.cpp
index de91620..c502fff 100644 (file)
--- a/src/inventory/inventory-object.cpp
+++ b/src/inventory/inventory-object.cpp
@@ -83,7 +83,7 @@ void inven_item_optimize(player_type *owner_ptr, INVENTORY_IDX item)
 
     if (item >= INVEN_MAIN_HAND) {
         owner_ptr->equip_cnt--;
-        (&owner_ptr->inventory_list[item])->object_wipe();
+        (&owner_ptr->inventory_list[item])->wipe();
         owner_ptr->update |= PU_BONUS;
         owner_ptr->update |= PU_TORCH;
         owner_ptr->update |= PU_MANA;
@@ -99,7 +99,7 @@ void inven_item_optimize(player_type *owner_ptr, INVENTORY_IDX item)
         owner_ptr->inventory_list[i] = owner_ptr->inventory_list[i + 1];
     }
 
-    (&owner_ptr->inventory_list[i])->object_wipe();
+    (&owner_ptr->inventory_list[i])->wipe();
     owner_ptr->window_flags |= PW_INVEN;
     owner_ptr->window_flags |= PW_SPELL;
 }
@@ -132,7 +132,7 @@ void drop_from_inventory(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER
     }
 
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
     distribute_charges(o_ptr, q_ptr, amt);
 
     q_ptr->number = amt;
@@ -187,7 +187,7 @@ void combine_pack(player_type *owner_ptr)
                         owner_ptr->inventory_list[k] = owner_ptr->inventory_list[k + 1];
                     }
 
-                    (&owner_ptr->inventory_list[k])->object_wipe();
+                    (&owner_ptr->inventory_list[k])->wipe();
                 } else {
                     int old_num = o_ptr->number;
                     int remain = j_ptr->number + o_ptr->number - max_num;
@@ -249,12 +249,12 @@ void reorder_pack(player_type *owner_ptr)
 
         flag = TRUE;
         q_ptr = &forge;
-        q_ptr->object_copy(&owner_ptr->inventory_list[i]);
+        q_ptr->copy_from(&owner_ptr->inventory_list[i]);
         for (k = i; k > j; k--) {
-            (&owner_ptr->inventory_list[k])->object_copy(&owner_ptr->inventory_list[k - 1]);
+            (&owner_ptr->inventory_list[k])->copy_from(&owner_ptr->inventory_list[k - 1]);
         }
 
-        (&owner_ptr->inventory_list[j])->object_copy(q_ptr);
+        (&owner_ptr->inventory_list[j])->copy_from(q_ptr);
         owner_ptr->window_flags |= (PW_INVEN);
     }
 
@@ -322,13 +322,13 @@ s16b store_item_to_inventory(player_type *owner_ptr, object_type *o_ptr)
 
         i = j;
         for (k = n; k >= i; k--) {
-            (&owner_ptr->inventory_list[k + 1])->object_copy(&owner_ptr->inventory_list[k]);
+            (&owner_ptr->inventory_list[k + 1])->copy_from(&owner_ptr->inventory_list[k]);
         }
 
-        (&owner_ptr->inventory_list[i])->object_wipe();
+        (&owner_ptr->inventory_list[i])->wipe();
     }
 
-    (&owner_ptr->inventory_list[i])->object_copy(o_ptr);
+    (&owner_ptr->inventory_list[i])->copy_from(o_ptr);
     j_ptr = &owner_ptr->inventory_list[i];
     j_ptr->held_m_idx = 0;
     j_ptr->iy = j_ptr->ix = 0;
@@ -396,7 +396,7 @@ INVENTORY_IDX inven_takeoff(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUM
     if (amt > o_ptr->number)
         amt = o_ptr->number;
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
     q_ptr->number = amt;
     describe_flavor(owner_ptr, o_name, q_ptr, 0);
     if (((item == INVEN_MAIN_HAND) || (item == INVEN_SUB_HAND)) && object_is_melee_weapon(o_ptr)) {

diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp
index 0a20ace..01fff84 100644 (file)
--- a/src/knowledge/knowledge-items.cpp
+++ b/src/knowledge/knowledge-items.cpp
@@ -106,7 +106,7 @@ void do_cmd_knowledge_artifacts(player_type *player_ptr)
             object_type forge;
             object_type *q_ptr;
             q_ptr = &forge;
-            q_ptr->object_prep(player_ptr, z);
+            q_ptr->prep(player_ptr, z);
             q_ptr->name1 = who[k];
             q_ptr->ident |= IDENT_STORE;
             describe_flavor(player_ptr, base_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
@@ -227,8 +227,8 @@ static void desc_obj_fake(player_type *creature_ptr, KIND_OBJECT_IDX k_idx)
     object_type *o_ptr;
     object_type object_type_body;
     o_ptr = &object_type_body;
-    o_ptr->object_wipe();
-    o_ptr->object_prep(creature_ptr, k_idx);
+    o_ptr->wipe();
+    o_ptr->prep(creature_ptr, k_idx);
 
     o_ptr->ident |= IDENT_KNOWN;
     handle_stuff(creature_ptr);

diff --git a/src/knowledge/knowledge-quests.cpp b/src/knowledge/knowledge-quests.cpp
index ae662d3..d6c99d3 100644 (file)
--- a/src/knowledge/knowledge-quests.cpp
+++ b/src/knowledge/knowledge-quests.cpp
@@ -98,7 +98,7 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff
                         object_type forge;
                         object_type *q_ptr = &forge;
                         KIND_OBJECT_IDX k_idx = lookup_kind(a_ptr->tval, a_ptr->sval);
-                        q_ptr->object_prep(creature_ptr, k_idx);
+                        q_ptr->prep(creature_ptr, k_idx);
                         q_ptr->name1 = quest[i].k_idx;
                         q_ptr->ident = IDENT_STORE;
                         describe_flavor(creature_ptr, name, q_ptr, OD_NAME_ONLY);

diff --git a/src/load/inventory-loader.cpp b/src/load/inventory-loader.cpp
index c52a0d3..9e9feec 100644 (file)
--- a/src/load/inventory-loader.cpp
+++ b/src/load/inventory-loader.cpp
@@ -37,7 +37,7 @@ static errr rd_inventory(player_type *player_ptr)
         object_type forge;
         object_type *q_ptr;
         q_ptr = &forge;
-        q_ptr->object_wipe();
+        q_ptr->wipe();
 
         rd_item(player_ptr, q_ptr);
         if (!q_ptr->k_idx)
@@ -45,7 +45,7 @@ static errr rd_inventory(player_type *player_ptr)
 
         if (n >= INVEN_MAIN_HAND) {
             q_ptr->marked |= OM_TOUCHED;
-            (&player_ptr->inventory_list[n])->object_copy(q_ptr);
+            (&player_ptr->inventory_list[n])->copy_from(q_ptr);
             player_ptr->equip_cnt++;
             continue;
         }
@@ -57,7 +57,7 @@ static errr rd_inventory(player_type *player_ptr)
 
         n = slot++;
         q_ptr->marked |= OM_TOUCHED;
-        (&player_ptr->inventory_list[n])->object_copy(q_ptr);
+        (&player_ptr->inventory_list[n])->copy_from(q_ptr);
         player_ptr->inven_cnt++;
     }
 

diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp
index 8ee4d25..9504e17 100644 (file)
--- a/src/load/store-loader.cpp
+++ b/src/load/store-loader.cpp
@@ -97,7 +97,7 @@ static errr rd_store(player_type *player_ptr, int town_number, int store_number)
         object_type forge;
         object_type *q_ptr;
         q_ptr = &forge;
-        q_ptr->object_wipe();
+        q_ptr->wipe();
 
         rd_item(player_ptr, q_ptr);
 
@@ -109,7 +109,7 @@ static errr rd_store(player_type *player_ptr, int town_number, int store_number)
             home_carry_load(player_ptr, store_ptr, q_ptr);
         } else {
             int k = store_ptr->stock_num++;
-            (&store_ptr->stock[k])->object_copy(q_ptr);
+            (&store_ptr->stock[k])->copy_from(q_ptr);
         }
     }
 

diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp
index 5d099aa..b9fd63d 100644 (file)
--- a/src/market/bounty.cpp
+++ b/src/market/bounty.cpp
@@ -163,7 +163,7 @@ bool exchange_cash(player_type *player_ptr)
 
             msg_format(_("これで合計 %d ポイント獲得しました。", "You earned %d point%s total."), num, (num > 1 ? "s" : ""));
 
-            (&forge)->object_prep(player_ptr, lookup_kind(prize_list[num - 1].tval, prize_list[num - 1].sval));
+            (&forge)->prep(player_ptr, lookup_kind(prize_list[num - 1].tval, prize_list[num - 1].sval));
             apply_magic_to_object(player_ptr, &forge, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART);
 
             object_aware(player_ptr, &forge);

diff --git a/src/market/building-craft-weapon.cpp b/src/market/building-craft-weapon.cpp
index c79c89d..3c9d8af 100644 (file)
--- a/src/market/building-craft-weapon.cpp
+++ b/src/market/building-craft-weapon.cpp
@@ -359,7 +359,7 @@ PRICE compare_weapons(player_type *customer_ptr, PRICE bcost)
     screen_save();
     clear_bldg(0, 22);
     i_ptr = &customer_ptr->inventory_list[INVEN_MAIN_HAND];
-    (&orig_weapon)->object_copy(i_ptr);
+    (&orig_weapon)->copy_from(i_ptr);
 
     item_tester_hook = item_tester_hook_orthodox_melee_weapons;
     concptr q = _("第一の武器は？", "What is your first weapon? ");
@@ -381,14 +381,14 @@ PRICE compare_weapons(player_type *customer_ptr, PRICE bcost)
         for (int i = 0; i < n; i++) {
             int col = (wid * i + mgn);
             if (o_ptr[i] != i_ptr)
-                i_ptr->object_copy(o_ptr[i]);
+                i_ptr->copy_from(o_ptr[i]);
 
             customer_ptr->update |= PU_BONUS;
             handle_stuff(customer_ptr);
 
             list_weapon(customer_ptr, o_ptr[i], row, col);
             compare_weapon_aux(customer_ptr, o_ptr[i], col, row + 8);
-            i_ptr->object_copy(&orig_weapon);
+            i_ptr->copy_from(&orig_weapon);
         }
 
         customer_ptr->update |= PU_BONUS;

diff --git a/src/mind/mind-archer.cpp b/src/mind/mind-archer.cpp
index 72a3c37..1196402 100644 (file)
--- a/src/mind/mind-archer.cpp
+++ b/src/mind/mind-archer.cpp
@@ -120,7 +120,7 @@ bool create_ammo(player_type *creature_ptr)
 
         object_type forge;
         object_type *q_ptr = &forge;
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_SHOT, (OBJECT_SUBTYPE_VALUE)m_bonus(1, creature_ptr->lev) + 1));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_SHOT, (OBJECT_SUBTYPE_VALUE)m_bonus(1, creature_ptr->lev) + 1));
         q_ptr->number = (byte)rand_range(15, 30);
         object_aware(creature_ptr, q_ptr);
         object_known(q_ptr);
@@ -148,7 +148,7 @@ bool create_ammo(player_type *creature_ptr)
 
         object_type forge;
         q_ptr = &forge;
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_ARROW, (OBJECT_SUBTYPE_VALUE)m_bonus(1, creature_ptr->lev) + 1));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_ARROW, (OBJECT_SUBTYPE_VALUE)m_bonus(1, creature_ptr->lev) + 1));
         q_ptr->number = (byte)rand_range(5, 10);
         object_aware(creature_ptr, q_ptr);
         object_known(q_ptr);
@@ -175,7 +175,7 @@ bool create_ammo(player_type *creature_ptr)
 
         object_type forge;
         q_ptr = &forge;
-        q_ptr->object_prep(creature_ptr, lookup_kind(TV_BOLT, (OBJECT_SUBTYPE_VALUE)m_bonus(1, creature_ptr->lev) + 1));
+        q_ptr->prep(creature_ptr, lookup_kind(TV_BOLT, (OBJECT_SUBTYPE_VALUE)m_bonus(1, creature_ptr->lev) + 1));
         q_ptr->number = (byte)rand_range(4, 8);
         object_aware(creature_ptr, q_ptr);
         object_known(q_ptr);

diff --git a/src/mind/mind-chaos-warrior.cpp b/src/mind/mind-chaos-warrior.cpp
index 534dd9a..6a23344 100644 (file)
--- a/src/mind/mind-chaos-warrior.cpp
+++ b/src/mind/mind-chaos-warrior.cpp
@@ -112,7 +112,7 @@ void acquire_chaos_weapon(player_type *creature_ptr)
         dummy2 = SV_BLADE_OF_CHAOS;
     }
 
-    q_ptr->object_prep(creature_ptr, lookup_kind(dummy, dummy2));
+    q_ptr->prep(creature_ptr, lookup_kind(dummy, dummy2));
     q_ptr->to_h = 3 + randint1(creature_ptr->current_floor_ptr->dun_level) % 10;
     q_ptr->to_d = 3 + randint1(creature_ptr->current_floor_ptr->dun_level) % 10;
     one_resistance(q_ptr);

diff --git a/src/mind/mind-hobbit.cpp b/src/mind/mind-hobbit.cpp
index 49f566e..c082095 100644 (file)
--- a/src/mind/mind-hobbit.cpp
+++ b/src/mind/mind-hobbit.cpp
@@ -10,7 +10,7 @@ bool create_ration(player_type *creature_ptr)
 {
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
+    q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
     (void)drop_near(creature_ptr, q_ptr, -1, creature_ptr->y, creature_ptr->x);
     msg_print(_("食事を料理して作った。", "You cook some food."));
     return TRUE;

diff --git a/src/mind/mind-mage.cpp b/src/mind/mind-mage.cpp
index 497af5b..a7607d0 100644 (file)
--- a/src/mind/mind-mage.cpp
+++ b/src/mind/mind-mage.cpp
@@ -77,7 +77,7 @@ bool eat_magic(player_type *caster_ptr, int power)
                     object_type forge;
                     object_type *q_ptr;
                     q_ptr = &forge;
-                    q_ptr->object_copy(o_ptr);
+                    q_ptr->copy_from(o_ptr);
 
                     q_ptr->number = 1;
                     o_ptr->pval++;

diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index 7cde0ed..897a562 100644 (file)
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -86,9 +86,9 @@ bool kawarimi(player_type *caster_ptr, bool success)
     POSITION x = caster_ptr->x;
 
     teleport_player(caster_ptr, 10 + randint1(90), TELEPORT_SPONTANEOUS);
-    q_ptr->object_wipe();
+    q_ptr->wipe();
     const int SV_WOODEN_STATUE = 0;
-    q_ptr->object_prep(caster_ptr, lookup_kind(TV_STATUE, SV_WOODEN_STATUE));
+    q_ptr->prep(caster_ptr, lookup_kind(TV_STATUE, SV_WOODEN_STATUE));
 
     q_ptr->pval = MON_NINJA;
     (void)drop_near(caster_ptr, q_ptr, -1, y, x);

diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp
index ba9f337..54c4033 100644 (file)
--- a/src/monster-attack/monster-eating.cpp
+++ b/src/monster-attack/monster-eating.cpp
@@ -105,7 +105,7 @@ static void move_item_to_monster(player_type *target_ptr, monap_type *monap_ptr,
 
     object_type *j_ptr;
     j_ptr = &target_ptr->current_floor_ptr->o_list[o_idx];
-    j_ptr->object_copy(monap_ptr->o_ptr);
+    j_ptr->copy_from(monap_ptr->o_ptr);
     j_ptr->number = 1;
     if ((monap_ptr->o_ptr->tval == TV_ROD) || (monap_ptr->o_ptr->tval == TV_WAND)) {
         j_ptr->pval = monap_ptr->o_ptr->pval / monap_ptr->o_ptr->number;

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index 7138687..5e4a1ae 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -90,7 +90,7 @@ static void on_defeat_arena_monster(player_type *player_ptr, monster_death_type
     if (arena_info[player_ptr->arena_number].tval) {
         object_type forge;
         object_type *q_ptr = &forge;
-        q_ptr->object_prep(player_ptr, lookup_kind(arena_info[player_ptr->arena_number].tval, arena_info[player_ptr->arena_number].sval));
+        q_ptr->prep(player_ptr, lookup_kind(arena_info[player_ptr->arena_number].tval, arena_info[player_ptr->arena_number].sval));
         apply_magic_to_object(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART);
         (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
     }
@@ -134,7 +134,7 @@ static void drop_corpse(player_type *player_ptr, monster_death_type *md_ptr)
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, lookup_kind(TV_CORPSE, (corpse ? SV_CORPSE : SV_SKELETON)));
+    q_ptr->prep(player_ptr, lookup_kind(TV_CORPSE, (corpse ? SV_CORPSE : SV_SKELETON)));
     apply_magic_to_object(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART);
     q_ptr->pval = md_ptr->m_ptr->r_idx;
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
@@ -215,7 +215,7 @@ static void drop_artifact(player_type *player_ptr, monster_death_type *md_ptr)
     if (k_idx != 0) {
         object_type forge;
         object_type *q_ptr = &forge;
-        q_ptr->object_prep(player_ptr, k_idx);
+        q_ptr->prep(player_ptr, k_idx);
         apply_magic_to_object(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | AM_GOOD);
         (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
     }
@@ -276,7 +276,7 @@ static void drop_items_golds(player_type *player_ptr, monster_death_type *md_ptr
     for (int i = 0; i < drop_numbers; i++) {
         object_type forge;
         object_type *q_ptr = &forge;
-        q_ptr->object_wipe();
+        q_ptr->wipe();
         if (md_ptr->do_gold && (!md_ptr->do_item || (randint0(100) < 50))) {
             if (!make_gold(player_ptr, q_ptr))
                 continue;

diff --git a/src/monster-floor/monster-object.cpp b/src/monster-floor/monster-object.cpp
index 4ef6268..f2e78a9 100644 (file)
--- a/src/monster-floor/monster-object.cpp
+++ b/src/monster-floor/monster-object.cpp
@@ -195,7 +195,7 @@ void monster_drop_carried_objects(player_type *player_ptr, monster_type *m_ptr)
         const OBJECT_IDX this_o_idx = *it++;
         o_ptr = &player_ptr->current_floor_ptr->o_list[this_o_idx];
         q_ptr = &forge;
-        q_ptr->object_copy(o_ptr);
+        q_ptr->copy_from(o_ptr);
         q_ptr->held_m_idx = 0;
         delete_object_idx(player_ptr, this_o_idx);
         (void)drop_near(player_ptr, q_ptr, -1, m_ptr->fy, m_ptr->fx);

diff --git a/src/monster-floor/special-death-switcher.cpp b/src/monster-floor/special-death-switcher.cpp
index 9f2413a..448437a 100644 (file)
--- a/src/monster-floor/special-death-switcher.cpp
+++ b/src/monster-floor/special-death-switcher.cpp
@@ -102,7 +102,7 @@ static void on_dead_bloodletter(player_type *player_ptr, monster_death_type *md_
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, lookup_kind(TV_SWORD, SV_BLADE_OF_CHAOS));
+    q_ptr->prep(player_ptr, lookup_kind(TV_SWORD, SV_BLADE_OF_CHAOS));
     apply_magic_to_object(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | md_ptr->mo_mode);
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
 }
@@ -115,7 +115,7 @@ static void on_dead_raal(player_type *player_ptr, monster_death_type *md_ptr)
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_wipe();
+    q_ptr->wipe();
     if ((floor_ptr->dun_level > 49) && one_in_(5))
         get_obj_num_hook = kind_is_good_book;
     else
@@ -188,12 +188,12 @@ static void on_dead_serpent(player_type *player_ptr, monster_death_type *md_ptr)
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, lookup_kind(TV_HAFTED, SV_GROND));
+    q_ptr->prep(player_ptr, lookup_kind(TV_HAFTED, SV_GROND));
     q_ptr->name1 = ART_GROND;
     apply_magic_to_object(player_ptr, q_ptr, -1, AM_GOOD | AM_GREAT);
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
     q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, lookup_kind(TV_CROWN, SV_CHAOS));
+    q_ptr->prep(player_ptr, lookup_kind(TV_CROWN, SV_CHAOS));
     q_ptr->name1 = ART_CHAOS;
     apply_magic_to_object(player_ptr, q_ptr, -1, AM_GOOD | AM_GREAT);
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
@@ -206,7 +206,7 @@ static void on_dead_death_sword(player_type *player_ptr, monster_death_type *md_
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, lookup_kind(TV_SWORD, randint1(2)));
+    q_ptr->prep(player_ptr, lookup_kind(TV_SWORD, randint1(2)));
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
 }
 
@@ -221,7 +221,7 @@ static void on_dead_can_angel(player_type *player_ptr, monster_death_type *md_pt
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, lookup_kind(TV_CHEST, SV_CHEST_KANDUME));
+    q_ptr->prep(player_ptr, lookup_kind(TV_CHEST, SV_CHEST_KANDUME));
     apply_magic_to_object(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART);
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);
 }
@@ -340,7 +340,7 @@ static void on_dead_big_raven(player_type *player_ptr, monster_death_type *md_pt
  */
 static bool make_equipment(player_type *player_ptr, object_type *q_ptr, const BIT_FLAGS drop_mode, const bool is_object_hook_null)
 {
-    q_ptr->object_wipe();
+    q_ptr->wipe();
     (void)make_object(player_ptr, q_ptr, drop_mode);
     if (!is_object_hook_null) {
         return true;
@@ -433,7 +433,7 @@ static void drop_specific_item_on_dead(player_type *player_ptr, monster_death_ty
 {
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_wipe();
+    q_ptr->wipe();
     get_obj_num_hook = object_hook_pf;
     (void)make_object(player_ptr, q_ptr, md_ptr->mo_mode);
     (void)drop_near(player_ptr, q_ptr, -1, md_ptr->md_y, md_ptr->md_x);

diff --git a/src/object-use/quaff-execution.cpp b/src/object-use/quaff-execution.cpp
index 7bee92d..1649d97 100644 (file)
--- a/src/object-use/quaff-execution.cpp
+++ b/src/object-use/quaff-execution.cpp
@@ -138,7 +138,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item)
 
     o_ptr = ref_item(creature_ptr, item);
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
     q_ptr->number = 1;
     vary_item(creature_ptr, item, -1);
     sound(SOUND_QUAFF);

diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp
index a9ddf0c..0cd2f0c 100644 (file)
--- a/src/perception/object-perception.cpp
+++ b/src/perception/object-perception.cpp
@@ -69,7 +69,7 @@ void object_aware(player_type *owner_ptr, object_type *o_ptr)
     GAME_TEXT o_name[MAX_NLEN];
 
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
 
     q_ptr->number = 1;
     describe_flavor(owner_ptr, o_name, q_ptr, OD_NAME_ONLY);

diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp
index 905d374..28663fb 100644 (file)
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -73,8 +73,8 @@ void calc_android_exp(player_type *creature_ptr)
         if (!o_ptr->k_idx)
             continue;
 
-        q_ptr->object_wipe();
-        q_ptr->object_copy(o_ptr);
+        q_ptr->wipe();
+        q_ptr->copy_from(o_ptr);
         q_ptr->discount = 0;
         q_ptr->curse_flags = 0L;
 

diff --git a/src/realm/realm-nature.cpp b/src/realm/realm-nature.cpp
index b95cf0a..9bca371 100644 (file)
--- a/src/realm/realm-nature.cpp
+++ b/src/realm/realm-nature.cpp
@@ -133,7 +133,7 @@ concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mod
                 msg_print(_("食料を生成した。", "A food ration is produced."));
 
                 /* Create the food ration */
-                q_ptr->object_prep(caster_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
+                q_ptr->prep(caster_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
 
                 /* Drop the object from heaven */
                 (void)drop_near(caster_ptr, q_ptr, -1, caster_ptr->y, caster_ptr->x);

diff --git a/src/specific-object/chest.cpp b/src/specific-object/chest.cpp
index 55b4697..7cc01bb 100644 (file)
--- a/src/specific-object/chest.cpp
+++ b/src/specific-object/chest.cpp
@@ -89,7 +89,7 @@ void chest_death(player_type *owner_ptr, bool scatter, POSITION y, POSITION x, O
        for (; number > 0; --number)
        {
                q_ptr = &forge;
-        q_ptr->object_wipe();
+        q_ptr->wipe();
 
                /* Small chests often drop gold */
                if (small && (randint0(100) < 25))

diff --git a/src/spell-kind/spells-enchant.cpp b/src/spell-kind/spells-enchant.cpp
index 6aa1d89..7b32ce6 100644 (file)
--- a/src/spell-kind/spells-enchant.cpp
+++ b/src/spell-kind/spells-enchant.cpp
@@ -139,7 +139,7 @@ bool mundane_spell(player_type *owner_ptr, bool only_equip)
     byte marked = o_ptr->marked;
     u16b inscription = o_ptr->inscription;
 
-    o_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+    o_ptr->prep(owner_ptr, o_ptr->k_idx);
 
     o_ptr->iy = iy;
     o_ptr->ix = ix;

diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp
index af6014d..b7218e8 100644 (file)
--- a/src/spell/spells-object.cpp
+++ b/src/spell/spells-object.cpp
@@ -114,7 +114,7 @@ void amusement(player_type *creature_ptr, POSITION y1, POSITION x1, int num, boo
                 break;
         }
         i_ptr = &object_type_body;
-        i_ptr->object_wipe();
+        i_ptr->wipe();
         k_idx = lookup_kind(amuse_info[i].tval, amuse_info[i].sval);
 
         /* Paranoia - reroll if nothing */
@@ -143,7 +143,7 @@ void amusement(player_type *creature_ptr, POSITION y1, POSITION x1, int num, boo
         }
 
         /* Make an object (if possible) */
-        i_ptr->object_prep(creature_ptr, k_idx);
+        i_ptr->prep(creature_ptr, k_idx);
         if (a_idx)
             i_ptr->name1 = a_idx;
         apply_magic_to_object(creature_ptr, i_ptr, 1, AM_NO_FIXED_ART);
@@ -193,7 +193,7 @@ void acquirement(player_type *caster_ptr, POSITION y1, POSITION x1, int num, boo
     /* Acquirement */
     while (num--) {
         i_ptr = &object_type_body;
-        i_ptr->object_wipe();
+        i_ptr->wipe();
 
         /* Make a good (or great) object (if possible) */
         if (!make_object(caster_ptr, i_ptr, mode))

diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp
index e7e5b7f..1e991e9 100644 (file)
--- a/src/spell/spells-status.cpp
+++ b/src/spell/spells-status.cpp
@@ -489,7 +489,7 @@ bool cosmic_cast_off(player_type *creature_ptr, object_type **o_ptr_ptr)
         return FALSE;
 
     object_type forge;
-    (&forge)->object_copy(o_ptr);
+    (&forge)->copy_from(o_ptr);
     inven_item_increase(creature_ptr, slot, (0 - o_ptr->number));
     inven_item_optimize(creature_ptr, slot);
 

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 9b81307..38d1e33 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -170,7 +170,7 @@ void do_cmd_store(player_type *player_ptr)
                 GAME_TEXT o_name[MAX_NLEN];
                 msg_print(_("ザックからアイテムがあふれてしまった！", "Your pack overflows!"));
                 q_ptr = &forge;
-                q_ptr->object_copy(o_ptr);
+                q_ptr->copy_from(o_ptr);
                 describe_flavor(player_ptr, o_name, q_ptr, 0);
                 msg_format(_("%sが落ちた。(%c)", "You drop %s (%c)."), o_name, index_to_label(item));
                 vary_item(player_ptr, item, -255);

diff --git a/src/store/home.cpp b/src/store/home.cpp
index cb9f492..eb561ec 100644 (file)
--- a/src/store/home.cpp
+++ b/src/store/home.cpp
@@ -93,7 +93,7 @@ static bool exe_combine_store_items(object_type *o_ptr, object_type *j_ptr, cons
     for (k = i; k < st_ptr->stock_num; k++)
         st_ptr->stock[k] = st_ptr->stock[k + 1];
 
-    (&st_ptr->stock[k])->object_wipe();
+    (&st_ptr->stock[k])->wipe();
     *combined = TRUE;
     return TRUE;
 }
@@ -150,11 +150,11 @@ static void exe_reorder_store_item(player_type *player_ptr, bool *flag)
         object_type *j_ptr;
         object_type forge;
         j_ptr = &forge;
-        j_ptr->object_copy(&st_ptr->stock[i]);
+        j_ptr->copy_from(&st_ptr->stock[i]);
         for (int k = i; k > j; k--)
-            (&st_ptr->stock[k])->object_copy(&st_ptr->stock[k - 1]);
+            (&st_ptr->stock[k])->copy_from(&st_ptr->stock[k - 1]);
 
-        (&st_ptr->stock[j])->object_copy(j_ptr);
+        (&st_ptr->stock[j])->copy_from(j_ptr);
     }
 }
 

diff --git a/src/store/purchase-order.cpp b/src/store/purchase-order.cpp
index 621ef01..e365405 100644 (file)
--- a/src/store/purchase-order.cpp
+++ b/src/store/purchase-order.cpp
@@ -209,7 +209,7 @@ void store_purchase(player_type *player_ptr)
     ITEM_NUMBER amt = 1;
     object_type forge;
     object_type *j_ptr = &forge;
-    j_ptr->object_copy(o_ptr);
+    j_ptr->copy_from(o_ptr);
 
     /*
      * If a rod or wand, allocate total maximum timeouts or charges
@@ -234,7 +234,7 @@ void store_purchase(player_type *player_ptr)
     }
 
     j_ptr = &forge;
-    j_ptr->object_copy(o_ptr);
+    j_ptr->copy_from(o_ptr);
 
     /*
      * If a rod or wand, allocate total maximum timeouts or charges

diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp
index 8daedd2..57263ed 100644 (file)
--- a/src/store/rumor.cpp
+++ b/src/store/rumor.cpp
@@ -76,7 +76,7 @@ void display_rumor(player_type *player_ptr, bool ex)
         KIND_OBJECT_IDX k_idx = lookup_kind(a_ptr->tval, a_ptr->sval);
         object_type forge;
         object_type *q_ptr = &forge;
-        q_ptr->object_prep(player_ptr, k_idx);
+        q_ptr->prep(player_ptr, k_idx);
         q_ptr->name1 = a_idx;
         q_ptr->ident = IDENT_STORE;
         describe_flavor(player_ptr, fullname, q_ptr, OD_NAME_ONLY);

diff --git a/src/store/sell-order.cpp b/src/store/sell-order.cpp
index 3228885..65ec64d 100644 (file)
--- a/src/store/sell-order.cpp
+++ b/src/store/sell-order.cpp
@@ -127,7 +127,7 @@ void store_sell(player_type *owner_ptr)
 
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
     q_ptr->number = amt;
 
     if ((o_ptr->tval == TV_ROD) || (o_ptr->tval == TV_WAND))
@@ -169,7 +169,7 @@ void store_sell(player_type *owner_ptr)
 
             identify_item(owner_ptr, o_ptr);
             q_ptr = &forge;
-            q_ptr->object_copy(o_ptr);
+            q_ptr->copy_from(o_ptr);
             q_ptr->number = amt;
             q_ptr->ident |= IDENT_STORE;
 

diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index f4df529..4d55a18 100644 (file)
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -62,7 +62,7 @@ void store_item_optimize(INVENTORY_IDX item)
     for (int j = item; j < st_ptr->stock_num; j++)
         st_ptr->stock[j] = st_ptr->stock[j + 1];
 
-    (&st_ptr->stock[st_ptr->stock_num])->object_wipe();
+    (&st_ptr->stock[st_ptr->stock_num])->wipe();
 }
 
 /*!
@@ -152,7 +152,7 @@ void store_create(
         object_type forge;
         object_type *q_ptr;
         q_ptr = &forge;
-        q_ptr->object_prep(player_ptr, k_idx);
+        q_ptr->prep(player_ptr, k_idx);
         apply_magic_to_object(player_ptr, q_ptr, level, AM_NO_FIXED_ART);
         if (!(*store_will_buy)(player_ptr, q_ptr))
             continue;

diff --git a/src/store/store.cpp b/src/store/store.cpp
index 90b4293..f05cd61 100644 (file)
--- a/src/store/store.cpp
+++ b/src/store/store.cpp
@@ -386,5 +386,5 @@ void store_init(int town_num, int store_num)
     st_ptr->stock_num = 0;
     st_ptr->last_visit = -10L * TURNS_PER_TICK * STORE_TICKS;
     for (int k = 0; k < st_ptr->stock_size; k++)
-        (&st_ptr->stock[k])->object_wipe();
+        (&st_ptr->stock[k])->wipe();
 }

diff --git a/src/system/object-type-definition.cpp b/src/system/object-type-definition.cpp
index c1fd819..675db7d 100644 (file)
--- a/src/system/object-type-definition.cpp
+++ b/src/system/object-type-definition.cpp
@@ -11,7 +11,7 @@
  * Wipe an object clean.
  * @param o_ptr 初期化したいオブジェクトの構造体参照ポインタ
  */
-void object_type::object_wipe()
+void object_type::wipe()
 {
     (void)WIPE(this, object_type);
 }
@@ -22,7 +22,7 @@ void object_type::object_wipe()
  * @param o_ptr 複製元のオブジェクトの構造体参照ポインタ
  * @param j_ptr 複製先のオブジェクトの構造体参照ポインタ
  */
-void object_type::object_copy(object_type *j_ptr)
+void object_type::copy_from(object_type *j_ptr)
 {
     (void)COPY(this, j_ptr, object_type);
 }
@@ -33,10 +33,10 @@ void object_type::object_copy(object_type *j_ptr)
  * @param o_ptr 代入したいオブジェクトの構造体参照ポインタ
  * @param k_idx 新たに作成したいベースアイテム情報のID
  */
-void object_type::object_prep(player_type *player_ptr, KIND_OBJECT_IDX ko_idx)
+void object_type::prep(player_type *player_ptr, KIND_OBJECT_IDX ko_idx)
 {
     object_kind *k_ptr = &k_info[ko_idx];
-    object_wipe();
+    wipe();
     this->k_idx = ko_idx;
     this->tval = k_ptr->tval;
     this->sval = k_ptr->sval;

diff --git a/src/system/object-type-definition.h b/src/system/object-type-definition.h
index 98462c7..ef72d86 100644 (file)
--- a/src/system/object-type-definition.h
+++ b/src/system/object-type-definition.h
@@ -44,7 +44,7 @@ typedef struct object_type {
     MONSTER_IDX held_m_idx; /*!< アイテムを所持しているモンスターID (いないなら 0) / Monster holding us (if any) */
     ARTIFACT_BIAS_IDX artifact_bias; /*!< ランダムアーティファクト生成時のバイアスID */
 
-    void object_wipe();
-    void object_copy(object_type *j_ptr);
-    void object_prep(player_type *player_ptr, KIND_OBJECT_IDX ko_idx);
+    void wipe();
+    void copy_from(object_type *j_ptr);
+    void prep(player_type *player_ptr, KIND_OBJECT_IDX ko_idx);
 } object_type;

diff --git a/src/view/object-describer.cpp b/src/view/object-describer.cpp
index 703b963..260872f 100644 (file)
--- a/src/view/object-describer.cpp
+++ b/src/view/object-describer.cpp
@@ -87,7 +87,7 @@ void display_koff(player_type *owner_ptr, KIND_OBJECT_IDX k_idx)
         return;
     q_ptr = &forge;
 
-    q_ptr->object_prep(owner_ptr, k_idx);
+    q_ptr->prep(owner_ptr, k_idx);
     describe_flavor(owner_ptr, o_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
 
     term_putstr(0, 0, -1, TERM_WHITE, o_name);

diff --git a/src/wizard/fixed-artifacts-spoiler.cpp b/src/wizard/fixed-artifacts-spoiler.cpp
index 73f4d2b..0650c87 100644 (file)
--- a/src/wizard/fixed-artifacts-spoiler.cpp
+++ b/src/wizard/fixed-artifacts-spoiler.cpp
@@ -92,7 +92,7 @@ static bool make_fake_artifact(player_type *player_ptr, object_type *o_ptr, ARTI
     if (!i)
         return FALSE;
 
-    o_ptr->object_prep(player_ptr, i);
+    o_ptr->prep(player_ptr, i);
     o_ptr->name1 = name1;
     o_ptr->pval = a_ptr->pval;
     o_ptr->ac = a_ptr->ac;
@@ -168,7 +168,7 @@ spoiler_output_status spoil_fixed_artifact(concptr fname)
                 continue;
 
             q_ptr = &forge;
-            q_ptr->object_wipe();
+            q_ptr->wipe();
             if (!make_fake_artifact(&dummy, q_ptr, j))
                 continue;
 

diff --git a/src/wizard/items-spoiler.cpp b/src/wizard/items-spoiler.cpp
index 5ac891a..00337e6 100644 (file)
--- a/src/wizard/items-spoiler.cpp
+++ b/src/wizard/items-spoiler.cpp
@@ -29,7 +29,7 @@ static void kind_info(player_type *player_ptr, char *buf, char *dam, char *wgt,
 {
     object_type forge;
     object_type *q_ptr = &forge;
-    q_ptr->object_prep(player_ptr, k);
+    q_ptr->prep(player_ptr, k);
     q_ptr->ident |= IDENT_KNOWN;
     q_ptr->pval = 0;
     q_ptr->to_a = 0;

diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index ba40ee5..7532f59 100644 (file)
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -438,7 +438,7 @@ static void wiz_statistics(player_type *caster_ptr, object_type *o_ptr)
 
             object_type forge;
             object_type *q_ptr = &forge;
-            q_ptr->object_wipe();
+            q_ptr->wipe();
             make_object(caster_ptr, q_ptr, mode);
             if (object_is_fixed_artifact(q_ptr))
                 a_info[q_ptr->name1].cur_num = 0;
@@ -480,7 +480,7 @@ static void wiz_reroll_item(player_type *owner_ptr, object_type *o_ptr)
     object_type forge;
     object_type *q_ptr;
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
 
     char ch;
     bool changed = FALSE;
@@ -509,32 +509,32 @@ static void wiz_reroll_item(player_type *owner_ptr, object_type *o_ptr)
         switch (tolower(ch)) {
         /* Apply bad magic, but first clear object */
         case 'w':
-            q_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+            q_ptr->prep(owner_ptr, o_ptr->k_idx);
             apply_magic_to_object(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT | AM_CURSED);
             break;
         /* Apply bad magic, but first clear object */
         case 'c':
-            q_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+            q_ptr->prep(owner_ptr, o_ptr->k_idx);
             apply_magic_to_object(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_CURSED);
             break;
         /* Apply normal magic, but first clear object */
         case 'n':
-            q_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+            q_ptr->prep(owner_ptr, o_ptr->k_idx);
             apply_magic_to_object(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART);
             break;
         /* Apply good magic, but first clear object */
         case 'g':
-            q_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+            q_ptr->prep(owner_ptr, o_ptr->k_idx);
             apply_magic_to_object(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD);
             break;
         /* Apply great magic, but first clear object */
         case 'e':
-            q_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+            q_ptr->prep(owner_ptr, o_ptr->k_idx);
             apply_magic_to_object(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT);
             break;
         /* Apply special magic, but first clear object */
         case 's':
-            q_ptr->object_prep(owner_ptr, o_ptr->k_idx);
+            q_ptr->prep(owner_ptr, o_ptr->k_idx);
             apply_magic_to_object(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_GOOD | AM_GREAT | AM_SPECIAL);
             if (!object_is_artifact(q_ptr))
                 become_random_artifact(owner_ptr, q_ptr, FALSE);
@@ -552,7 +552,7 @@ static void wiz_reroll_item(player_type *owner_ptr, object_type *o_ptr)
     if (!changed)
         return;
 
-    o_ptr->object_copy(q_ptr);
+    o_ptr->copy_from(q_ptr);
     set_bits(owner_ptr->update, PU_BONUS | PU_COMBINE | PU_REORDER);
     set_bits(owner_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_FLOOR_ITEM_LIST);
 }
@@ -651,7 +651,7 @@ void wiz_modify_item(player_type *creature_ptr)
     object_type forge;
     object_type *q_ptr;
     q_ptr = &forge;
-    q_ptr->object_copy(o_ptr);
+    q_ptr->copy_from(o_ptr);
     char ch;
     bool changed = FALSE;
     while (TRUE) {
@@ -687,7 +687,7 @@ void wiz_modify_item(player_type *creature_ptr)
     if (changed) {
         msg_print("Changes accepted.");
 
-        o_ptr->object_copy(q_ptr);
+        o_ptr->copy_from(q_ptr);
         set_bits(creature_ptr->update, PU_BONUS | PU_COMBINE | PU_REORDER);
         set_bits(creature_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_FLOOR_ITEM_LIST);
     } else {
@@ -843,7 +843,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo
             if (k_ptr->name.empty())
                 continue;
 
-            o_ptr->object_prep(caster_ptr, k);
+            o_ptr->prep(caster_ptr, k);
             describe_flavor(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
 #ifndef JP
             str_tolower(o_name);
@@ -863,7 +863,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo
 
         if (allow_ego && k_ids.size() == 1) {
             KIND_OBJECT_IDX k_idx = k_ids.back();
-            o_ptr->object_prep(caster_ptr, k_idx);
+            o_ptr->prep(caster_ptr, k_idx);
 
             for (EGO_IDX k = 1; k < max_e_idx; k++) {
                 ego_item_type *e_ptr = &e_info[k];
@@ -904,7 +904,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo
             if (!k_idx)
                 continue;
 
-            o_ptr->object_prep(caster_ptr, k_idx);
+            o_ptr->prep(caster_ptr, k_idx);
             o_ptr->name1 = i;
 
             describe_flavor(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
@@ -1014,7 +1014,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo
         if (wish_randart) {
             if (must || ok_art) {
                 do {
-                    o_ptr->object_prep(caster_ptr, k_idx);
+                    o_ptr->prep(caster_ptr, k_idx);
                     apply_magic_to_object(caster_ptr, o_ptr, k_ptr->level, (AM_SPECIAL | AM_NO_FIXED_ART));
                 } while (!o_ptr->art_name || o_ptr->name1 || o_ptr->name2 || object_is_cursed(o_ptr));
 
@@ -1030,14 +1030,14 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo
         if (allow_ego && (wish_ego || e_ids.size() > 0)) {
             if (must || ok_ego) {
                 if (e_ids.size() > 0) {
-                    o_ptr->object_prep(caster_ptr, k_idx);
+                    o_ptr->prep(caster_ptr, k_idx);
                     o_ptr->name2 = e_ids[0];
                     apply_ego(caster_ptr, o_ptr, caster_ptr->current_floor_ptr->base_level);
                 } else {
                     int max_roll = 1000;
                     int i = 0;
                     for (i = 0; i < max_roll; i++) {
-                        o_ptr->object_prep(caster_ptr, k_idx);
+                        o_ptr->prep(caster_ptr, k_idx);
                         (void)apply_magic_to_object(caster_ptr, o_ptr, k_ptr->level, (AM_GREAT | AM_NO_FIXED_ART));
 
                         if (o_ptr->name1 || o_ptr->art_name)
@@ -1070,7 +1070,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo
             res = WishResult::EGO;
         } else {
             for (int i = 0; i < 100; i++) {
-                o_ptr->object_prep(caster_ptr, k_idx);
+                o_ptr->prep(caster_ptr, k_idx);
                 apply_magic_to_object(caster_ptr, o_ptr, 0, (AM_NO_FIXED_ART));
                 if (!object_is_cursed(o_ptr))
                     break;

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 0f97fda..e20cf7a 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -202,7 +202,7 @@ void wiz_create_item(player_type *caster_ptr)
     object_type forge;
     object_type *q_ptr;
     q_ptr = &forge;
-    q_ptr->object_prep(caster_ptr, k_idx);
+    q_ptr->prep(caster_ptr, k_idx);
     apply_magic_to_object(caster_ptr, q_ptr, caster_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART);
     (void)drop_near(caster_ptr, q_ptr, -1, caster_ptr->y, caster_ptr->x);
     msg_print("Allocated.");
@@ -439,7 +439,7 @@ void wiz_learn_items_all(player_type *caster_ptr)
         object_kind *k_ptr = &k_info[i];
         if (k_ptr->level <= command_arg) {
             q_ptr = &forge;
-            q_ptr->object_prep(caster_ptr, i);
+            q_ptr->prep(caster_ptr, i);
             object_aware(caster_ptr, q_ptr);
         }
     }

diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp
index 2042453..4788f29 100644 (file)
--- a/src/wizard/wizard-spoiler.cpp
+++ b/src/wizard/wizard-spoiler.cpp
@@ -259,7 +259,7 @@ static spoiler_output_status spoil_player_spell(concptr fname)
         if (magic_ptr->spell_book != 0) {
             object_type book;
             auto o_ptr = &book;
-            o_ptr->object_prep(&dummy_p, lookup_kind(magic_ptr->spell_book, 0));
+            o_ptr->prep(&dummy_p, lookup_kind(magic_ptr->spell_book, 0));
             describe_flavor(&dummy_p, title, o_ptr, OD_NAME_ONLY);
             book_name = title;
             char *s = angband_strchr(book_name, '[');