From 19448037b62971ecc648b16fe8969f527aa0d5ef Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 6 May 2019 20:41:06 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=94?= =?utf8?q?=E3=83=BC=E3=83=A9=E3=82=A4=E3=83=88=E6=83=85=E5=A0=B1=20?= =?utf8?q?=E3=82=92=20core.c/h=20=E3=81=B8=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.c | 13 +++++++++++++ src/core.h | 2 ++ src/externs.h | 2 +- src/variable.c | 13 ------------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/core.c b/src/core.c index e24aad1ac..d8885a522 100644 --- a/src/core.c +++ b/src/core.c @@ -78,6 +78,19 @@ #include "autopick.h" #include "save.h" + /*! + * コピーライト情報 / + * Hack -- Link a copyright message into the executable + */ +const concptr copyright[5] = +{ + "Copyright (c) 1989 James E. Wilson, Robert A. Keoneke", + "", + "This software may be copied and distributed for educational, research,", + "and not for profit purposes provided that this copyright and statement", + "are included in all such copies." +}; + concptr ANGBAND_SYS = "xxx"; //!< Hack -- The special Angband "System Suffix" This variable is used to choose an appropriate "pref-xxx" file #ifdef JP diff --git a/src/core.h b/src/core.h index b3e73f728..a444bf81f 100644 --- a/src/core.h +++ b/src/core.h @@ -1,5 +1,7 @@ #pragma once +extern const concptr copyright[5]; + extern concptr ANGBAND_SYS; extern concptr ANGBAND_KEYBOARD; extern concptr ANGBAND_GRAF; diff --git a/src/externs.h b/src/externs.h index ecfa03aec..072d70b64 100644 --- a/src/externs.h +++ b/src/externs.h @@ -83,7 +83,7 @@ extern const concptr ident_info[]; extern const byte feature_action_flags[FF_FLAG_MAX]; /* variable.c */ -extern const concptr copyright[5]; + extern bool character_generated; extern bool character_dungeon; diff --git a/src/variable.c b/src/variable.c index ea99bdb4b..4e719578c 100644 --- a/src/variable.c +++ b/src/variable.c @@ -13,19 +13,6 @@ #include "angband.h" #include "geometry.h" -/*! - * コピーライト情報 / - * Hack -- Link a copyright message into the executable - */ -const concptr copyright[5] = -{ - "Copyright (c) 1989 James E. Wilson, Robert A. Keoneke", - "", - "This software may be copied and distributed for educational, research,", - "and not for profit purposes provided that this copyright and statement", - "are included in all such copies." -}; - int max_macrotrigger = 0; /*!< 現在登録中のマクロ(トリガー)の数 */ concptr macro_template = NULL; /*!< Angband設定ファイルのT: タグ情報から読み込んだ長いTコードを処理するために利用する文字列ポインタ */ concptr macro_modifier_chr; /*!< &x# で指定されるマクロトリガーに関する情報を記録する文字列ポインタ */ -- 2.11.0