#37353 歌領域処理を cmd-spell.c から realm-song.c/h へ分離。

[hengband/hengband.git] / src / store.c

diff --git a/src/store.c b/src/store.c
index 28e64a7..01a374f 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -11,6 +11,9 @@
  */
 
 #include "angband.h"
+#include "cmd-item.h"
+#include "cmd-zapwand.h"
+#include "cmd-magiceat.h"
 
 #define MIN_STOCK 12
 
@@ -1113,7 +1116,7 @@ static void mass_produce(object_type *o_ptr)
        /* Ensure that mass-produced rods and wands get the correct pvals. */
        if ((o_ptr->tval == TV_ROD) || (o_ptr->tval == TV_WAND))
        {
-               o_ptr->pval *= o_ptr->number;
+               o_ptr->pval *= (PARAMETER_VALUE)o_ptr->number;
        }
 }
 
@@ -2081,7 +2084,9 @@ static void store_delete(void)
  */
 static void store_create(void)
 {
-       int i, tries, level;
+       OBJECT_IDX i;
+       int tries;
+       DEPTH level;
 
        object_type forge;
        object_type *q_ptr;
@@ -2610,7 +2615,7 @@ static void display_store(void)
  * @param j 選択範囲の最大値
  * @return 実際に選択したらTRUE、キャンセルしたらFALSE
  */
-static int get_stock(int *com_val, cptr pmt, int i, int j)
+static int get_stock(COMMAND_CODE *com_val, cptr pmt, int i, int j)
 {
        char    command;
        char    out_val[160];
@@ -2654,7 +2659,7 @@ static int get_stock(int *com_val, cptr pmt, int i, int j)
        /* Ask until done */
        while (TRUE)
        {
-               int k;
+               COMMAND_CODE k;
 
                /* Escape */
                if (!get_com(out_val, &command, FALSE)) break;
@@ -3431,7 +3436,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
 static void store_purchase(void)
 {
        int i, choice;
-       int item, item_new;
+       COMMAND_CODE item, item_new;
 
        ITEM_NUMBER amt;
 
@@ -3885,7 +3890,8 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price);
 static void store_sell(void)
 {
        int choice;
-       int item, item_pos;
+       OBJECT_IDX item;
+       int item_pos;
        int amt;
 
        s32b price, value, dummy;
@@ -4289,7 +4295,7 @@ msg_format("%sを $%ldで売却しました。", o_name, (long)price);
 static void store_examine(void)
 {
        int         i;
-       int         item;
+       COMMAND_CODE item;
        object_type *o_ptr;
        char        o_name[MAX_NLEN];
        char        out_val[160];
@@ -4391,7 +4397,7 @@ msg_print("特に変わったところはないようだ。");
 static void museum_remove_object(void)
 {
        int         i;
-       int         item;
+       COMMAND_CODE item;
        object_type *o_ptr;
        char        o_name[MAX_NLEN];
        char        out_val[160];