From 521f61175251e616d60cffecc67eb20f4a25d597 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 11 Apr 2019 23:47:35 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=BE=B3=E5=AE=9A?= =?utf8?q?=E7=BE=A9=E3=82=92=E3=80=80avater.h=20=E3=81=AB=E7=A7=BB?= =?utf8?q?=E5=8B=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/avatar.h | 21 +++++++++++++++++++++ src/defines.h | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/avatar.h b/src/avatar.h index bbba82443..94a074738 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -1,4 +1,25 @@ /* avatar.c */ +#define MAX_VIRTUE 18 /*!< 徳定義の最大数 */ + +#define V_COMPASSION 1 +#define V_HONOUR 2 +#define V_JUSTICE 3 +#define V_SACRIFICE 4 +#define V_KNOWLEDGE 5 +#define V_FAITH 6 +#define V_ENLIGHTEN 7 +#define V_ENCHANT 8 +#define V_CHANCE 9 +#define V_NATURE 10 +#define V_HARMONY 11 +#define V_VITALITY 12 +#define V_UNLIFE 13 +#define V_PATIENCE 14 +#define V_TEMPERANCE 15 +#define V_DILIGENCE 16 +#define V_VALOUR 17 +#define V_INDIVIDUALISM 18 + extern bool compare_virtue(int type, int num, int tekitou); extern int virtue_number(int type); extern concptr virtue[MAX_VIRTUE]; diff --git a/src/defines.h b/src/defines.h index b2f1337b8..7218a28b7 100644 --- a/src/defines.h +++ b/src/defines.h @@ -3420,27 +3420,6 @@ extern int PlayerUID; */ #define SOUND_MAX 67 /*!< 効果音定義の最大数 */ -#define MAX_VIRTUE 18 /*!< 徳定義の最大数 */ - -#define V_COMPASSION 1 -#define V_HONOUR 2 -#define V_JUSTICE 3 -#define V_SACRIFICE 4 -#define V_KNOWLEDGE 5 -#define V_FAITH 6 -#define V_ENLIGHTEN 7 -#define V_ENCHANT 8 -#define V_CHANCE 9 -#define V_NATURE 10 -#define V_HARMONY 11 -#define V_VITALITY 12 -#define V_UNLIFE 13 -#define V_PATIENCE 14 -#define V_TEMPERANCE 15 -#define V_DILIGENCE 16 -#define V_VALOUR 17 -#define V_INDIVIDUALISM 18 - /*** Hack ***/ -- 2.11.0