[merge](2.2.1.3) fix-gcc-warningブランチをマージ

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

diff --git a/src/cmd3.c b/src/cmd3.c
index 5592c73..a80147b 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -234,7 +234,7 @@ void do_cmd_wield(void)
 
        cptr q, s;
 
-       int need_switch_wielding = 0;
+       OBJECT_IDX need_switch_wielding = 0;
 
        if (p_ptr->special_defense & KATA_MUSOU)
        {
@@ -840,18 +840,18 @@ static bool high_level_book(object_type *o_ptr)
  */
 void do_cmd_destroy(void)
 {
-       OBJECT_IDX item, amt = 1;
-       int                     old_number;
-
-       bool            force = FALSE;
+       OBJECT_IDX item;
+       QUANTITY amt = 1;
+       QUANTITY old_number;
 
-       object_type             *o_ptr;
-       object_type             forge;
-       object_type             *q_ptr = &forge;
+       bool force = FALSE;
 
-       char            o_name[MAX_NLEN];
+       object_type *o_ptr;
+       object_type forge;
+       object_type *q_ptr = &forge;
 
-       char            out_val[MAX_NLEN+40];
+       char o_name[MAX_NLEN];
+       char out_val[MAX_NLEN+40];
 
        cptr q, s;