#37287 #37353 (2.2.0.89) COMMAND_NUM 型を定義し、型の置換を継続中。 / Define COMMAND_NUM, ongoing...

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

diff --git a/src/cmd3.c b/src/cmd3.c
index fb1bbe9..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)
        {
@@ -636,7 +636,7 @@ void kamaenaoshi(int item)
  */
 void do_cmd_takeoff(void)
 {
-       int item;
+       OBJECT_IDX item;
 
        object_type *o_ptr;
 
@@ -732,7 +732,8 @@ void do_cmd_takeoff(void)
  */
 void do_cmd_drop(void)
 {
-       int item, amt = 1;
+       OBJECT_IDX item;
+       int amt = 1;
 
        object_type *o_ptr;
 
@@ -839,18 +840,18 @@ static bool high_level_book(object_type *o_ptr)
  */
 void do_cmd_destroy(void)
 {
-       int                     item, amt = 1;
-       int                     old_number;
+       OBJECT_IDX item;
+       QUANTITY amt = 1;
+       QUANTITY old_number;
 
-       bool            force = FALSE;
+       bool force = FALSE;
 
-       object_type             *o_ptr;
-       object_type             forge;
-       object_type             *q_ptr = &forge;
-
-       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;
 
@@ -1061,10 +1062,8 @@ void do_cmd_destroy(void)
  */
 void do_cmd_observe(void)
 {
-       int                     item;
-
+       OBJECT_IDX item;
        object_type             *o_ptr;
-
        char            o_name[MAX_NLEN];
 
        cptr q, s;
@@ -1120,10 +1119,8 @@ void do_cmd_observe(void)
  */
 void do_cmd_uninscribe(void)
 {
-       int   item;
-
+       OBJECT_IDX item;
        object_type *o_ptr;
-
        cptr q, s;
 
        item_tester_no_ryoute = TRUE;
@@ -1182,14 +1179,10 @@ void do_cmd_uninscribe(void)
  */
 void do_cmd_inscribe(void)
 {
-       int                     item;
-
+       OBJECT_IDX item;
        object_type             *o_ptr;
-
        char            o_name[MAX_NLEN];
-
        char            out_val[80];
-
        cptr q, s;
 
        item_tester_no_ryoute = TRUE;
@@ -1279,7 +1272,7 @@ static bool item_tester_refill_lantern(object_type *o_ptr)
  */
 static void do_cmd_refill_lamp(void)
 {
-       int item;
+       OBJECT_IDX item;
 
        object_type *o_ptr;
        object_type *j_ptr;
@@ -1388,7 +1381,7 @@ static bool item_tester_refill_torch(object_type *o_ptr)
  */
 static void do_cmd_refill_torch(void)
 {
-       int item;
+       OBJECT_IDX item;
 
        object_type *o_ptr;
        object_type *j_ptr;