[Refactor] #37353 amusement() を spell-object.c に移動。 / Move amusement() to spells...

diff --git a/src/cmd-read.c b/src/cmd-read.c
index d5c968c..a41163a 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -8,14 +8,16 @@
 \r
 #include "angband.h"\r
 #include "object-hook.h"\r
-#include "spells-summon.h"\r
 #include "artifact.h"\r
 #include "avatar.h"\r
 #include "player-status.h"\r
-#include "spells-status.h"\r
 #include "rumor.h"\r
 #include "realm-hex.h"\r
 \r
+#include "spells-object.h"\r
+#include "spells-summon.h"\r
+#include "spells-status.h"\r
+\r
 /*!\r
  * @brief 巻物を読むコマンドのサブルーチン\r
  * Read a scroll (from the pack or floor).\r

diff --git a/src/externs.h b/src/externs.h
index ea71b42..0d2aebf 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -822,7 +822,6 @@ extern bool make_gold(object_type *j_ptr);
 extern void place_gold(POSITION y, POSITION x);
 extern OBJECT_IDX drop_near(object_type *o_ptr, PERCENTAGE chance, POSITION y, POSITION x);
 extern void acquirement(POSITION y1, POSITION x1, int num, bool great, bool special, bool known);
-extern void amusement(POSITION y1, POSITION x1, int num, bool known);
 extern void inven_item_charges(INVENTORY_IDX item);
 extern void inven_item_describe(INVENTORY_IDX item);
 extern void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num);

diff --git a/src/object2.c b/src/object2.c
index 5732cc0..1489bab 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -5414,129 +5414,6 @@ void acquirement(POSITION y1, POSITION x1, int num, bool great, bool special, bo
        }
 }
 
-/*
- * Scatter some "amusing" objects near the player
- */
-
-#define AMS_NOTHING   0x00 /* No restriction */
-#define AMS_NO_UNIQUE 0x01 /* Don't make the amusing object of uniques */
-#define AMS_FIXED_ART 0x02 /* Make a fixed artifact based on the amusing object */
-#define AMS_MULTIPLE  0x04 /* Drop 1-3 objects for one type */
-#define AMS_PILE      0x08 /* Drop 1-99 pile objects for one type */
-
-typedef struct
-{
-       OBJECT_TYPE_VALUE tval;
-       OBJECT_SUBTYPE_VALUE sval;
-       PERCENTAGE prob;
-       byte flag;
-} amuse_type;
-
-amuse_type amuse_info[] =
-{
-       { TV_BOTTLE, SV_ANY, 5, AMS_NOTHING },
-       { TV_JUNK, SV_ANY, 3, AMS_MULTIPLE },
-       { TV_SPIKE, SV_ANY, 10, AMS_PILE },
-       { TV_STATUE, SV_ANY, 15, AMS_NOTHING },
-       { TV_CORPSE, SV_ANY, 15, AMS_NO_UNIQUE },
-       { TV_SKELETON, SV_ANY, 10, AMS_NO_UNIQUE },
-       { TV_FIGURINE, SV_ANY, 10, AMS_NO_UNIQUE },
-       { TV_PARCHMENT, SV_ANY, 1, AMS_NOTHING },
-       { TV_POLEARM, SV_TSURIZAO, 3, AMS_NOTHING }, //Fishing Pole of Taikobo
-       { TV_SWORD, SV_BROKEN_DAGGER, 3, AMS_FIXED_ART }, //Broken Dagger of Magician
-       { TV_SWORD, SV_BROKEN_DAGGER, 10, AMS_NOTHING },
-       { TV_SWORD, SV_BROKEN_SWORD, 5, AMS_NOTHING },
-       { TV_SCROLL, SV_SCROLL_AMUSEMENT, 10, AMS_NOTHING },
-
-       { 0, 0, 0 }
-};
-
-/*!
- * @brief 誰得ドロップを行う。
- * @param y1 配置したいフロアのY座標
- * @param x1 配置したいフロアのX座標
- * @param num 誰得の処理回数
- * @param known TRUEならばオブジェクトが必ず＊鑑定＊済になる
- * @return なし
- */
-void amusement(POSITION y1, POSITION x1, int num, bool known)
-{
-       object_type *i_ptr;
-       object_type object_type_body;
-       int n, t = 0;
-
-       for (n = 0; amuse_info[n].tval != 0; n++)
-       {
-               t += amuse_info[n].prob;
-       }
-
-       /* Acquirement */
-       while (num)
-       {
-               int i;
-               KIND_OBJECT_IDX k_idx;
-               ARTIFACT_IDX a_idx = 0;
-               int r = randint0(t);
-               bool insta_art, fixed_art;
-
-               for (i = 0; ; i++)
-               {
-                       r -= amuse_info[i].prob;
-                       if (r <= 0) break;
-               }
-               i_ptr = &object_type_body;
-               object_wipe(i_ptr);
-               k_idx = lookup_kind(amuse_info[i].tval, amuse_info[i].sval);
-
-               /* Paranoia - reroll if nothing */
-               if (!k_idx) continue;
-
-               /* Search an artifact index if need */
-               insta_art = (k_info[k_idx].gen_flags & TRG_INSTA_ART);
-               fixed_art = (amuse_info[i].flag & AMS_FIXED_ART);
-
-               if (insta_art || fixed_art)
-               {
-                       for (a_idx = 1; a_idx < max_a_idx; a_idx++)
-                       {
-                               if (insta_art && !(a_info[a_idx].gen_flags & TRG_INSTA_ART)) continue;
-                               if (a_info[a_idx].tval != k_info[k_idx].tval) continue;
-                               if (a_info[a_idx].sval != k_info[k_idx].sval) continue;
-                               if (a_info[a_idx].cur_num > 0) continue;
-                               break;
-                       }
-
-                       if (a_idx >= max_a_idx) continue;
-               }
-
-               /* Make an object (if possible) */
-               object_prep(i_ptr, k_idx);
-               if (a_idx) i_ptr->name1 = a_idx;
-               apply_magic(i_ptr, 1, AM_NO_FIXED_ART);
-
-               if (amuse_info[i].flag & AMS_NO_UNIQUE)
-               {
-                       if (r_info[i_ptr->pval].flags1 & RF1_UNIQUE) continue;
-               }
-
-               if (amuse_info[i].flag & AMS_MULTIPLE) i_ptr->number = randint1(3);
-               if (amuse_info[i].flag & AMS_PILE) i_ptr->number = randint1(99);
-
-               if (known)
-               {
-                       object_aware(i_ptr);
-                       object_known(i_ptr);
-               }
-
-               /* Paranoia - reroll if nothing */
-               if (!(i_ptr->k_idx)) continue;
-
-               /* Drop the object */
-               (void)drop_near(i_ptr, -1, y1, x1);
-
-               num--;
-       }
-}
 
 
 /*!

diff --git a/src/spells-object.c b/src/spells-object.c
index 10dc2bb..8c88f30 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -4,6 +4,44 @@
 #include "object-hook.h"
 #include "player-status.h"
 
+
+typedef struct
+{
+       OBJECT_TYPE_VALUE tval;
+       OBJECT_SUBTYPE_VALUE sval;
+       PERCENTAGE prob;
+       byte flag;
+} amuse_type;
+
+/*
+ * Scatter some "amusing" objects near the player
+ */
+
+#define AMS_NOTHING   0x00 /* No restriction */
+#define AMS_NO_UNIQUE 0x01 /* Don't make the amusing object of uniques */
+#define AMS_FIXED_ART 0x02 /* Make a fixed artifact based on the amusing object */
+#define AMS_MULTIPLE  0x04 /* Drop 1-3 objects for one type */
+#define AMS_PILE      0x08 /* Drop 1-99 pile objects for one type */
+
+static amuse_type amuse_info[] =
+{
+       { TV_BOTTLE, SV_ANY, 5, AMS_NOTHING },
+       { TV_JUNK, SV_ANY, 3, AMS_MULTIPLE },
+       { TV_SPIKE, SV_ANY, 10, AMS_PILE },
+       { TV_STATUE, SV_ANY, 15, AMS_NOTHING },
+       { TV_CORPSE, SV_ANY, 15, AMS_NO_UNIQUE },
+       { TV_SKELETON, SV_ANY, 10, AMS_NO_UNIQUE },
+       { TV_FIGURINE, SV_ANY, 10, AMS_NO_UNIQUE },
+       { TV_PARCHMENT, SV_ANY, 1, AMS_NOTHING },
+       { TV_POLEARM, SV_TSURIZAO, 3, AMS_NOTHING }, //Fishing Pole of Taikobo
+       { TV_SWORD, SV_BROKEN_DAGGER, 3, AMS_FIXED_ART }, //Broken Dagger of Magician
+       { TV_SWORD, SV_BROKEN_DAGGER, 10, AMS_NOTHING },
+       { TV_SWORD, SV_BROKEN_SWORD, 5, AMS_NOTHING },
+       { TV_SCROLL, SV_SCROLL_AMUSEMENT, 10, AMS_NOTHING },
+
+       { 0, 0, 0 }
+};
+
 /*!
  * @brief「弾/矢の製造」処理 / do_cmd_cast calls this function if the player's class is 'archer'.
  * Hook to determine if an object is contertible in an arrow/bolt
@@ -302,3 +340,90 @@ bool import_magic_device(void)
        take_turn(p_ptr, 100);;
        return TRUE;
 }
+
+/*!
+ * @brief 誰得ドロップを行う。
+ * @param y1 配置したいフロアのY座標
+ * @param x1 配置したいフロアのX座標
+ * @param num 誰得の処理回数
+ * @param known TRUEならばオブジェクトが必ず＊鑑定＊済になる
+ * @return なし
+ */
+void amusement(POSITION y1, POSITION x1, int num, bool known)
+{
+       object_type *i_ptr;
+       object_type object_type_body;
+       int n, t = 0;
+
+       for (n = 0; amuse_info[n].tval != 0; n++)
+       {
+               t += amuse_info[n].prob;
+       }
+
+       /* Acquirement */
+       while (num)
+       {
+               int i;
+               KIND_OBJECT_IDX k_idx;
+               ARTIFACT_IDX a_idx = 0;
+               int r = randint0(t);
+               bool insta_art, fixed_art;
+
+               for (i = 0; ; i++)
+               {
+                       r -= amuse_info[i].prob;
+                       if (r <= 0) break;
+               }
+               i_ptr = &object_type_body;
+               object_wipe(i_ptr);
+               k_idx = lookup_kind(amuse_info[i].tval, amuse_info[i].sval);
+
+               /* Paranoia - reroll if nothing */
+               if (!k_idx) continue;
+
+               /* Search an artifact index if need */
+               insta_art = (k_info[k_idx].gen_flags & TRG_INSTA_ART);
+               fixed_art = (amuse_info[i].flag & AMS_FIXED_ART);
+
+               if (insta_art || fixed_art)
+               {
+                       for (a_idx = 1; a_idx < max_a_idx; a_idx++)
+                       {
+                               if (insta_art && !(a_info[a_idx].gen_flags & TRG_INSTA_ART)) continue;
+                               if (a_info[a_idx].tval != k_info[k_idx].tval) continue;
+                               if (a_info[a_idx].sval != k_info[k_idx].sval) continue;
+                               if (a_info[a_idx].cur_num > 0) continue;
+                               break;
+                       }
+
+                       if (a_idx >= max_a_idx) continue;
+               }
+
+               /* Make an object (if possible) */
+               object_prep(i_ptr, k_idx);
+               if (a_idx) i_ptr->name1 = a_idx;
+               apply_magic(i_ptr, 1, AM_NO_FIXED_ART);
+
+               if (amuse_info[i].flag & AMS_NO_UNIQUE)
+               {
+                       if (r_info[i_ptr->pval].flags1 & RF1_UNIQUE) continue;
+               }
+
+               if (amuse_info[i].flag & AMS_MULTIPLE) i_ptr->number = randint1(3);
+               if (amuse_info[i].flag & AMS_PILE) i_ptr->number = randint1(99);
+
+               if (known)
+               {
+                       object_aware(i_ptr);
+                       object_known(i_ptr);
+               }
+
+               /* Paranoia - reroll if nothing */
+               if (!(i_ptr->k_idx)) continue;
+
+               /* Drop the object */
+               (void)drop_near(i_ptr, -1, y1, x1);
+
+               num--;
+       }
+}

diff --git a/src/spells-object.h b/src/spells-object.h
index 7c4d271..462d80e 100644 (file)
--- a/src/spells-object.h
+++ b/src/spells-object.h
@@ -2,3 +2,4 @@
 
 extern bool create_ammo(void);
 extern bool import_magic_device(void);
+extern void amusement(POSITION y1, POSITION x1, int num, bool known);