From a151ef8ef13e77bd41aaf6920e2ba1243696acb1 Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 25 May 2019 19:00:45 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20SPELL=5F*=20=E5=AE=9A?= =?utf8?q?=E7=BE=A9=E3=82=92=20cmd-spell.h=E3=80=80=E3=81=B8=E7=A7=BB?= =?utf8?q?=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-spell.c | 1 + src/cmd-spell.h | 8 ++++++++ src/defines.h | 13 ------------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/cmd-spell.c b/src/cmd-spell.c index 7f05ae2c2..4f993a6e8 100644 --- a/src/cmd-spell.c +++ b/src/cmd-spell.c @@ -9,6 +9,7 @@ #include "angband.h" #include "core.h" #include "util.h" +#include "cmd-spell.h" #include "cmd-dump.h" #include "selfinfo.h" diff --git a/src/cmd-spell.h b/src/cmd-spell.h index 2bd5530ea..d96a5816e 100644 --- a/src/cmd-spell.h +++ b/src/cmd-spell.h @@ -9,6 +9,14 @@ extern const u32b fake_spell_flags[4]; + +#define SPELL_NAME 0 +#define SPELL_DESC 1 +#define SPELL_INFO 2 +#define SPELL_CAST 3 +#define SPELL_FAIL 4 +#define SPELL_STOP 5 +#define SPELL_CONT 6 extern concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode); extern concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base); diff --git a/src/defines.h b/src/defines.h index 73fdefd53..a97bee7b6 100644 --- a/src/defines.h +++ b/src/defines.h @@ -279,19 +279,6 @@ #define REALM1_BOOK (p_ptr->realm1 + TV_LIFE_BOOK - 1) #define REALM2_BOOK (p_ptr->realm2 + TV_LIFE_BOOK - 1) - -/* - * Mode constant for do_spell() - */ -#define SPELL_NAME 0 -#define SPELL_DESC 1 -#define SPELL_INFO 2 -#define SPELL_CAST 3 -#define SPELL_FAIL 4 -#define SPELL_STOP 5 -#define SPELL_CONT 6 - - /* * Maximum number of "normal" pack slots, and the index of the "overflow" * slot, which can hold an item, but only temporarily, since it causes the -- 2.11.0