練気術師で練気術を選択する際のダミーのアイテムスロット1111を記号定数INVEN_FORCEに変更.

diff --git a/src/cmd5.c b/src/cmd5.c
index bcbb7dc..d2d3186 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -435,7 +435,7 @@ s = "
        }
        select_the_force = FALSE;
 
-       if (item == 1111) { /* the_force */
+       if (item == INVEN_FORCE) { /* the_force */
            do_cmd_mind_browse();
            return;
        } else
@@ -4780,7 +4780,7 @@ s = "
        }
        select_the_force = FALSE;
 
-       if (item == 1111) { /* the_force */
+       if (item == INVEN_FORCE) { /* the_force */
            do_cmd_mind();
            return;
        } else

diff --git a/src/defines.h b/src/defines.h
index 06e9726..bc5c576 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -736,6 +736,11 @@
  */
 #define INVEN_TOTAL     36
 
+/*
+ * Fake inventory slot for selecting force (hard-coded).
+ */
+#define INVEN_FORCE     1111
+
 
 /*
  * Indexes of the various "stats" (hard-coded by savefiles, etc).

diff --git a/src/object1.c b/src/object1.c
index 858f0f8..775e219 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -5366,7 +5366,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
        /* Get the item index */
        if (repeat_pull(cp))
        {
-               if (*cp == 1111) { /* the_force */
+               if (*cp == INVEN_FORCE) { /* the_force */
                    item_tester_tval = 0;
                    item_tester_hook = NULL;
                    return (TRUE);
@@ -5497,7 +5497,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
                done = TRUE;
 
                if (select_the_force) {
-                   *cp = 1111;
+                   *cp = INVEN_FORCE;
                    item = TRUE;
                }
        }
@@ -5822,7 +5822,7 @@ if (allow_floor) strcat(out_val, " '-'
                        case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
@@ -6024,7 +6024,7 @@ if (other_query_flag && !verify("
                        case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
@@ -6388,7 +6388,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
        /* Get the item index */
        if (repeat_pull(cp))
        {
-               if (*cp == 1111) { /* the_force */
+               if (*cp == INVEN_FORCE) { /* the_force */
                    item_tester_tval = 0;
                    item_tester_hook = NULL;
                    return (TRUE);
@@ -6518,7 +6518,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
                done = TRUE;
 
                if (select_the_force) {
-                   *cp = 1111;
+                   *cp = INVEN_FORCE;
                    item = TRUE;
                }
        }
@@ -7098,7 +7098,7 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;
@@ -7394,7 +7394,7 @@ if (!command_see && !use_menu) strcat(out_val, " '*'
                        case 'w':
                        {
                                if (select_the_force) {
-                                       *cp = 1111;
+                                       *cp = INVEN_FORCE;
                                        item = TRUE;
                                        done = TRUE;
                                        break;