From: Hourier Date: Fri, 30 Apr 2021 08:43:01 +0000 (+0900) Subject: [Refactor] #933 Renamed accessory-enchanter-base.h to enchanter-base.h X-Git-Tag: vmacos3.0.0-alpha52~210^2~3^2~7 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3c3e9bce430608c157cd52282b9d719b0d34eb16;p=hengbandforosx%2Fhengbandosx.git [Refactor] #933 Renamed accessory-enchanter-base.h to enchanter-base.h --- diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 40ed91fa0..a91da2a3b 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -1352,7 +1352,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index c474b97fd..eb1508045 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -3230,7 +3230,7 @@ object-enchant - + object-enchant diff --git a/src/Makefile.am b/src/Makefile.am index 43d40ad98..2db8a0ace 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -564,7 +564,6 @@ hengband_SOURCES = \ object-activation/activation-teleport.cpp object-activation/activation-teleport.h \ object-activation/activation-util.cpp object-activation/activation-util.h \ \ - object-enchant/accessory-enchanter-base.h \ object-enchant/activation-info-table.cpp object-enchant/activation-info-table.h \ object-enchant/apply-magic.cpp object-enchant/apply-magic.h \ object-enchant/apply-magic-amulet.cpp object-enchant/apply-magic-amulet.h \ @@ -573,6 +572,7 @@ hengband_SOURCES = \ object-enchant/apply-magic-ring.cpp object-enchant/apply-magic-ring.h \ object-enchant/apply-magic-weapon.cpp object-enchant/apply-magic-weapon.h \ object-enchant/dragon-breaths-table.cpp object-enchant/dragon-breaths-table.h \ + object-enchant/enchanter-base.h \ object-enchant/object-boost.cpp object-enchant/object-boost.h \ object-enchant/object-curse.cpp object-enchant/object-curse.h \ object-enchant/object-ego.cpp object-enchant/object-ego.h \ diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp index 4bd2f21a3..6116f5bb0 100644 --- a/src/birth/inventory-initializer.cpp +++ b/src/birth/inventory-initializer.cpp @@ -122,7 +122,7 @@ static void decide_initial_items(player_type *creature_ptr, object_type *q_ptr) case RACE_ANDROID: /* Flasks of oil */ object_prep(creature_ptr, q_ptr, lookup_kind(TV_FLASK, SV_ANY)); - apply_magic(creature_ptr, q_ptr, 1, AM_NO_FIXED_ART); + 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; diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp index a74320e69..db18212a4 100644 --- a/src/floor/fixed-map-generator.cpp +++ b/src/floor/fixed-map-generator.cpp @@ -182,7 +182,7 @@ static void parse_qtw_D(player_type *player_ptr, qtwg_type *qtwg_ptr, char *s) coin_type = 0; } - apply_magic(player_ptr, o_ptr, floor_ptr->base_level, AM_NO_FIXED_ART | AM_GOOD); + apply_magic_to_object(player_ptr, o_ptr, floor_ptr->base_level, AM_NO_FIXED_ART | AM_GOOD); drop_here(floor_ptr, o_ptr, *qtwg_ptr->y, *qtwg_ptr->x); } diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp index ada517e55..d4ef009c9 100644 --- a/src/floor/floor-object.cpp +++ b/src/floor/floor-object.cpp @@ -121,7 +121,7 @@ bool make_object(player_type *owner_ptr, object_type *j_ptr, BIT_FLAGS mode) object_prep(owner_ptr, j_ptr, k_idx); } - apply_magic(owner_ptr, j_ptr, floor_ptr->object_level, mode); + apply_magic_to_object(owner_ptr, j_ptr, floor_ptr->object_level, mode); switch (j_ptr->tval) { case TV_SPIKE: case TV_SHOT: diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp index 8f9e427aa..2da09f1d8 100644 --- a/src/market/bounty.cpp +++ b/src/market/bounty.cpp @@ -165,7 +165,7 @@ bool exchange_cash(player_type *player_ptr) msg_format(_("これで合計 %d ポイント獲得しました。", "You earned %d point%s total."), num, (num > 1 ? "s" : "")); object_prep(player_ptr, &forge, lookup_kind(prize_list[num - 1].tval, prize_list[num - 1].sval)); - apply_magic(player_ptr, &forge, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART); + apply_magic_to_object(player_ptr, &forge, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART); object_aware(player_ptr, &forge); object_known(&forge); diff --git a/src/mind/mind-archer.cpp b/src/mind/mind-archer.cpp index bd561363f..57b57ea5a 100644 --- a/src/mind/mind-archer.cpp +++ b/src/mind/mind-archer.cpp @@ -125,7 +125,7 @@ bool create_ammo(player_type *creature_ptr) q_ptr->number = (byte)rand_range(15, 30); object_aware(creature_ptr, q_ptr); object_known(q_ptr); - apply_magic(creature_ptr, q_ptr, creature_ptr->lev, AM_NO_FIXED_ART); + apply_magic_to_object(creature_ptr, q_ptr, creature_ptr->lev, AM_NO_FIXED_ART); q_ptr->discount = 99; s16b slot = store_item_to_inventory(creature_ptr, q_ptr); GAME_TEXT o_name[MAX_NLEN]; @@ -153,7 +153,7 @@ bool create_ammo(player_type *creature_ptr) q_ptr->number = (byte)rand_range(5, 10); object_aware(creature_ptr, q_ptr); object_known(q_ptr); - apply_magic(creature_ptr, q_ptr, creature_ptr->lev, AM_NO_FIXED_ART); + apply_magic_to_object(creature_ptr, q_ptr, creature_ptr->lev, AM_NO_FIXED_ART); q_ptr->discount = 99; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(creature_ptr, o_name, q_ptr, 0); @@ -180,7 +180,7 @@ bool create_ammo(player_type *creature_ptr) q_ptr->number = (byte)rand_range(4, 8); object_aware(creature_ptr, q_ptr); object_known(q_ptr); - apply_magic(creature_ptr, q_ptr, creature_ptr->lev, AM_NO_FIXED_ART); + apply_magic_to_object(creature_ptr, q_ptr, creature_ptr->lev, AM_NO_FIXED_ART); q_ptr->discount = 99; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(creature_ptr, o_name, q_ptr, 0); diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp index 896145d47..ccc3d49f3 100644 --- a/src/monster-floor/monster-death.cpp +++ b/src/monster-floor/monster-death.cpp @@ -92,7 +92,7 @@ static void on_defeat_arena_monster(player_type *player_ptr, monster_death_type object_type forge; object_type *q_ptr = &forge; object_prep(player_ptr, q_ptr, lookup_kind(arena_info[player_ptr->arena_number].tval, arena_info[player_ptr->arena_number].sval)); - apply_magic(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART); + 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); } @@ -136,7 +136,7 @@ static void drop_corpse(player_type *player_ptr, monster_death_type *md_ptr) object_type forge; object_type *q_ptr = &forge; object_prep(player_ptr, q_ptr, lookup_kind(TV_CORPSE, (corpse ? SV_CORPSE : SV_SKELETON))); - apply_magic(player_ptr, q_ptr, floor_ptr->object_level, AM_NO_FIXED_ART); + 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); } @@ -217,7 +217,7 @@ static void drop_artifact(player_type *player_ptr, monster_death_type *md_ptr) object_type forge; object_type *q_ptr = &forge; object_prep(player_ptr, q_ptr, k_idx); - apply_magic(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | AM_GOOD); + 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); } diff --git a/src/monster-floor/special-death-switcher.cpp b/src/monster-floor/special-death-switcher.cpp index 5b1333a0c..431acd0c8 100644 --- 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; object_prep(player_ptr, q_ptr, lookup_kind(TV_SWORD, SV_BLADE_OF_CHAOS)); - apply_magic(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART | md_ptr->mo_mode); + 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); } @@ -189,12 +189,12 @@ static void on_dead_serpent(player_type *player_ptr, monster_death_type *md_ptr) object_type *q_ptr = &forge; object_prep(player_ptr, q_ptr, lookup_kind(TV_HAFTED, SV_GROND)); q_ptr->name1 = ART_GROND; - apply_magic(player_ptr, q_ptr, -1, AM_GOOD | AM_GREAT); + 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; object_prep(player_ptr, q_ptr, lookup_kind(TV_CROWN, SV_CHAOS)); q_ptr->name1 = ART_CHAOS; - apply_magic(player_ptr, q_ptr, -1, AM_GOOD | AM_GREAT); + 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); } @@ -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; object_prep(player_ptr, q_ptr, lookup_kind(TV_CHEST, SV_CHEST_KANDUME)); - apply_magic(player_ptr, q_ptr, player_ptr->current_floor_ptr->object_level, AM_NO_FIXED_ART); + 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); } diff --git a/src/object-enchant/accessory-enchanter-base.h b/src/object-enchant/accessory-enchanter-base.h deleted file mode 100644 index aa3bc4b1a..000000000 --- a/src/object-enchant/accessory-enchanter-base.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "system/angband.h" - -typedef struct object_type object_type; -typedef struct player_type player_type; -class AccessoryEnchanterBase { -public: - virtual void apply_magic_accessary() = 0; - -protected: - AccessoryEnchanterBase() = default; - virtual ~AccessoryEnchanterBase() = default; - virtual void enchant() = 0; - virtual void give_ego_index() = 0; - virtual void give_high_ego_index() = 0; - virtual void give_cursed() = 0; -}; diff --git a/src/object-enchant/apply-magic-amulet.cpp b/src/object-enchant/apply-magic-amulet.cpp index a6a98339a..56e77d880 100644 --- a/src/object-enchant/apply-magic-amulet.cpp +++ b/src/object-enchant/apply-magic-amulet.cpp @@ -35,7 +35,7 @@ AmuletEnchanter::AmuletEnchanter(player_type *owner_ptr, object_type *o_ptr, DEP * @return なし * @details power > 2 is debug only */ -void AmuletEnchanter::apply_magic_accessary() +void AmuletEnchanter::apply_magic() { enchant(); if ((one_in_(150) && (this->power > 0) && !object_is_cursed(this->o_ptr) && (this->level > 79)) || (this->power > 2)) { diff --git a/src/object-enchant/apply-magic-amulet.h b/src/object-enchant/apply-magic-amulet.h index dc92a81db..4fa5948ed 100644 --- a/src/object-enchant/apply-magic-amulet.h +++ b/src/object-enchant/apply-magic-amulet.h @@ -1,16 +1,16 @@ #pragma once -#include "object-enchant/accessory-enchanter-base.h" +#include "object-enchant/enchanter-base.h" #include "system/angband.h" struct object_type; struct player_type; -class AmuletEnchanter : AccessoryEnchanterBase { +class AmuletEnchanter : EnchanterBase { public: AmuletEnchanter(player_type *owner_ptr, object_type *o_ptr, DEPTH level, int power); AmuletEnchanter() = delete; virtual ~AmuletEnchanter() = default; - void apply_magic_accessary() override; + void apply_magic() override; protected: void enchant() override; diff --git a/src/object-enchant/apply-magic-ring.cpp b/src/object-enchant/apply-magic-ring.cpp index 9f49f5dff..8383d21ca 100644 --- a/src/object-enchant/apply-magic-ring.cpp +++ b/src/object-enchant/apply-magic-ring.cpp @@ -35,7 +35,7 @@ RingEnchanter::RingEnchanter(player_type *owner_ptr, object_type *o_ptr, DEPTH l * @return なし * @details power > 2 is debug only */ -void RingEnchanter::apply_magic_accessary() +void RingEnchanter::apply_magic() { enchant(); if ((one_in_(400) && (this->power > 0) && !object_is_cursed(this->o_ptr) && (this->level > 79)) || (this->power > 2)) { diff --git a/src/object-enchant/apply-magic-ring.h b/src/object-enchant/apply-magic-ring.h index 655eb4422..3ed7b393a 100644 --- a/src/object-enchant/apply-magic-ring.h +++ b/src/object-enchant/apply-magic-ring.h @@ -1,16 +1,16 @@ #pragma once -#include "object-enchant/accessory-enchanter-base.h" +#include "object-enchant/enchanter-base.h" #include "system/angband.h" struct object_type; struct player_type; -class RingEnchanter : AccessoryEnchanterBase { +class RingEnchanter : EnchanterBase { public: RingEnchanter(player_type *owner_ptr, object_type *o_ptr, DEPTH level, int power); RingEnchanter() = delete; virtual ~RingEnchanter() = default; - void apply_magic_accessary() override; + void apply_magic() override; protected: void enchant() override; diff --git a/src/object-enchant/apply-magic.cpp b/src/object-enchant/apply-magic.cpp index 1091ffeea..d51b52c06 100644 --- a/src/object-enchant/apply-magic.cpp +++ b/src/object-enchant/apply-magic.cpp @@ -44,7 +44,7 @@ * @details * エゴ＆アーティファクトの生成、呪い、pval強化 */ -void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAGS mode) +void apply_magic_to_object(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAGS mode) { if (owner_ptr->pseikaku == PERSONALITY_MUNCHKIN) lev += randint0(owner_ptr->lev / 2 + 10); @@ -159,14 +159,14 @@ void apply_magic(player_type *owner_ptr, object_type *o_ptr, DEPTH lev, BIT_FLAG power = -1; } - RingEnchanter(owner_ptr, o_ptr, lev, power).apply_magic_accessary(); + RingEnchanter(owner_ptr, o_ptr, lev, power).apply_magic(); break; case TV_AMULET: { if (!power && (randint0(100) < 50)) { power = -1; } - AmuletEnchanter(owner_ptr, o_ptr, lev, power).apply_magic_accessary(); + AmuletEnchanter(owner_ptr, o_ptr, lev, power).apply_magic(); break; } default: { diff --git a/src/object-enchant/apply-magic.h b/src/object-enchant/apply-magic.h index a6828f489..1c79301a6 100644 --- a/src/object-enchant/apply-magic.h +++ b/src/object-enchant/apply-magic.h @@ -4,4 +4,4 @@ typedef struct object_type object_type; typedef struct player_type player_type; -void apply_magic(player_type *owner_type, object_type *o_ptr, DEPTH lev, BIT_FLAGS mode); +void apply_magic_to_object(player_type *owner_type, object_type *o_ptr, DEPTH lev, BIT_FLAGS mode); diff --git a/src/object-enchant/enchanter-base.h b/src/object-enchant/enchanter-base.h new file mode 100644 index 000000000..0e0a02f7a --- /dev/null +++ b/src/object-enchant/enchanter-base.h @@ -0,0 +1,26 @@ +#pragma once + +/* + * @file enchanter-base.h + * @brief エゴ・ランダムアーティファクト・呪われたアイテムをベースアイテムから生成する処理の基底クラス + * @author Hourier + * @date 2021/04/30 + * @details 純粋仮想関数につき、必要なメンバ変数は派生クラスで設定すること + */ + +#include "system/angband.h" + +typedef struct object_type object_type; +typedef struct player_type player_type; +class EnchanterBase { +public: + virtual void apply_magic() = 0; + +protected: + EnchanterBase() = default; + virtual ~EnchanterBase() = default; + virtual void enchant() = 0; + virtual void give_ego_index() = 0; + virtual void give_high_ego_index() = 0; + virtual void give_cursed() = 0; +}; diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp index 8bb779ce0..c91dcb519 100644 --- a/src/spell/spells-object.cpp +++ b/src/spell/spells-object.cpp @@ -147,7 +147,7 @@ void amusement(player_type *creature_ptr, POSITION y1, POSITION x1, int num, boo object_prep(creature_ptr, i_ptr, k_idx); if (a_idx) i_ptr->name1 = a_idx; - apply_magic(creature_ptr, i_ptr, 1, AM_NO_FIXED_ART); + apply_magic_to_object(creature_ptr, i_ptr, 1, AM_NO_FIXED_ART); if (amuse_info[i].flag & AMS_NO_UNIQUE) { if (r_info[i_ptr->pval].flags1 & RF1_UNIQUE) diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp index 818dfc745..696a10c02 100644 --- a/src/store/store-util.cpp +++ b/src/store/store-util.cpp @@ -154,7 +154,7 @@ void store_create( object_type *q_ptr; q_ptr = &forge; object_prep(player_ptr, q_ptr, k_idx); - apply_magic(player_ptr, q_ptr, level, AM_NO_FIXED_ART); + 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/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp index 49f5f3d8e..9438d0562 100644 --- a/src/wizard/wizard-item-modifier.cpp +++ b/src/wizard/wizard-item-modifier.cpp @@ -511,32 +511,32 @@ static void wiz_reroll_item(player_type *owner_ptr, object_type *o_ptr) /* Apply bad magic, but first clear object */ case 'w': object_prep(owner_ptr, q_ptr, o_ptr->k_idx); - apply_magic(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT | AM_CURSED); + 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': object_prep(owner_ptr, q_ptr, o_ptr->k_idx); - apply_magic(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_CURSED); + 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': object_prep(owner_ptr, q_ptr, o_ptr->k_idx); - apply_magic(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART); + 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': object_prep(owner_ptr, q_ptr, o_ptr->k_idx); - apply_magic(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD); + 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': object_prep(owner_ptr, q_ptr, o_ptr->k_idx); - apply_magic(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART | AM_GOOD | AM_GREAT); + 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': object_prep(owner_ptr, q_ptr, o_ptr->k_idx); - apply_magic(owner_ptr, q_ptr, owner_ptr->current_floor_ptr->dun_level, AM_GOOD | AM_GREAT | AM_SPECIAL); + 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); @@ -1016,7 +1016,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo if (must || ok_art) { do { object_prep(caster_ptr, o_ptr, k_idx); - apply_magic(caster_ptr, o_ptr, k_ptr->level, (AM_SPECIAL | AM_NO_FIXED_ART)); + 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)); if (o_ptr->art_name) @@ -1039,7 +1039,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo int i = 0; for (i = 0; i < max_roll; i++) { object_prep(caster_ptr, o_ptr, k_idx); - (void)apply_magic(caster_ptr, o_ptr, k_ptr->level, (AM_GREAT | AM_NO_FIXED_ART)); + (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) continue; @@ -1072,7 +1072,7 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo } else { for (int i = 0; i < 100; i++) { object_prep(caster_ptr, o_ptr, k_idx); - apply_magic(caster_ptr, o_ptr, 0, (AM_NO_FIXED_ART)); + 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 dfdcc572e..e7e6fa1e5 100644 --- a/src/wizard/wizard-special-process.cpp +++ b/src/wizard/wizard-special-process.cpp @@ -204,7 +204,7 @@ void wiz_create_item(player_type *caster_ptr) object_type *q_ptr; q_ptr = &forge; object_prep(caster_ptr, q_ptr, k_idx); - apply_magic(caster_ptr, q_ptr, caster_ptr->current_floor_ptr->dun_level, AM_NO_FIXED_ART); + 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."); }