From 37140bc995927e5d12be36a6041151a5abe1e3dd Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 13 May 2019 20:59:02 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20listsym=20=E3=82=92=20wiza?= =?utf8?q?rd2.c=20=E3=81=B8=E7=A7=BB=E5=8B=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 1 - src/tables.c | 16 ---------------- src/wizard2.c | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/externs.h b/src/externs.h index c3e4f12e0..f39ce5e29 100644 --- a/src/externs.h +++ b/src/externs.h @@ -22,7 +22,6 @@ /* tables.c */ -extern const char listsym[]; extern const byte adj_mag_study[]; extern const byte adj_mag_mana[]; extern const byte adj_mag_fail[]; diff --git a/src/tables.c b/src/tables.c index ee3887fef..52f36328f 100644 --- a/src/tables.c +++ b/src/tables.c @@ -15,22 +15,6 @@ #include "angband.h" #include "spells.h" - -/*! - * 選択処理用キーコード / - * Global array for converting numbers to a logical list symbol - */ -const char listsym[] = -{ - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', - 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', - 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - '\0' -}; - - /*! * 知力/賢さによるレベル毎の習得可能魔法数テーブル * Stat Table (INT/WIS) -- Number of half-spells per level diff --git a/src/wizard2.c b/src/wizard2.c index adb406fc7..2aa9e7baa 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -602,6 +602,21 @@ static tval_desc tvals[] = { 0, NULL } }; + +/*! + * 選択処理用キーコード / + * Global array for converting numbers to a logical list symbol + */ +static const char listsym[] = +{ + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', + 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', + '\0' +}; + /*! * @brief ベースアイテムのウィザード生成のために大項目IDと小項目IDを取得する / * Specify tval and sval (type and subtype of object) originally -- 2.11.0