• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision5d1edde639e09e9c53f6e258ec593fc0ab794154 (tree)
Time2019-05-09 19:11:25
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 game_inscriptions を object-flavor.c/h へ移動.

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -55,14 +55,11 @@ extern const concptr stat_names[6];
5555 extern const concptr stat_names_reduced[6];
5656 extern const concptr window_flag_desc[32];
5757
58-extern const concptr game_inscriptions[];
59-
6058 extern const concptr ident_info[];
6159 extern const byte feature_action_flags[FF_FLAG_MAX];
6260
6361 /* variable.c */
6462
65-
6663 extern bool character_generated;
6764 extern bool character_dungeon;
6865 extern bool character_loaded;
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -26,6 +26,38 @@
2626 #include "monsterrace.h"
2727 #include "object-ego.h"
2828
29+ /*!
30+ * @brief アイテムの価値記述テーブル /
31+ * Table of game-generated inscriptions (indexed by the defines in defines.h). -- RG
32+ */
33+const concptr game_inscriptions[] =
34+{
35+ NULL, /* FEEL_NONE */
36+#ifdef JP
37+ "壊れている", /* FEEL_BROKEN */
38+ "恐ろしい", /* FEEL_TERRIBLE */
39+ "無価値", /* FEEL_WORTHLESS */
40+ "呪われている", /* FEEL_CURSED */
41+ "上質以上", /* FEEL_UNCURSED */
42+ "並", /* FEEL_AVERAGE */
43+ "上質", /* FEEL_GOOD */
44+ "高級品", /* FEEL_EXCELLENT */
45+ "特別製", /* FEEL_SPECIAL */
46+#else
47+ "broken", /* FEEL_BROKEN */
48+ "terrible", /* FEEL_TERRIBLE */
49+ "worthless", /* FEEL_WORTHLESS */
50+ "cursed", /* FEEL_CURSED */
51+ "uncursed", /* FEEL_UNCURSED */
52+ "average", /* FEEL_AVERAGE */
53+ "good", /* FEEL_GOOD */
54+ "excellent", /* FEEL_EXCELLENT */
55+ "special", /* FEEL_SPECIAL */
56+#endif
57+
58+};
59+
60+
2961 /*!
3062 * @brief 最初から簡易な名称が明らかになるベースアイテムの判定。 / Certain items, if aware, are known instantly
3163 * @param i ベースアイテムID
--- a/src/object-flavor.h
+++ b/src/object-flavor.h
@@ -13,6 +13,8 @@ extern char *object_desc_kosuu(char *t, object_type *o_ptr);
1313 extern void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode);
1414 extern void strip_name(char *buf, KIND_OBJECT_IDX k_idx);
1515
16+extern const concptr game_inscriptions[];
17+
1618 /*
1719 * Bit flags for object_desc()
1820 */
--- a/src/tables.c
+++ b/src/tables.c
@@ -1166,36 +1166,6 @@ const concptr window_flag_desc[32] =
11661166 };
11671167
11681168
1169-/*!
1170- * @brief アイテムの価値記述テーブル /
1171- * Table of game-generated inscriptions (indexed by the defines in defines.h). -- RG
1172- */
1173-const concptr game_inscriptions[] =
1174-{
1175- NULL, /* FEEL_NONE */
1176-#ifdef JP
1177- "壊れている", /* FEEL_BROKEN */
1178- "恐ろしい", /* FEEL_TERRIBLE */
1179- "無価値", /* FEEL_WORTHLESS */
1180- "呪われている", /* FEEL_CURSED */
1181- "上質以上", /* FEEL_UNCURSED */
1182- "並", /* FEEL_AVERAGE */
1183- "上質", /* FEEL_GOOD */
1184- "高級品", /* FEEL_EXCELLENT */
1185- "特別製", /* FEEL_SPECIAL */
1186-#else
1187- "broken", /* FEEL_BROKEN */
1188- "terrible", /* FEEL_TERRIBLE */
1189- "worthless", /* FEEL_WORTHLESS */
1190- "cursed", /* FEEL_CURSED */
1191- "uncursed", /* FEEL_UNCURSED */
1192- "average", /* FEEL_AVERAGE */
1193- "good", /* FEEL_GOOD */
1194- "excellent", /* FEEL_EXCELLENT */
1195- "special", /* FEEL_SPECIAL */
1196-#endif
1197-
1198-};
11991169
12001170 /*!
12011171 * @brief シンボル解説テーブル /
Show on old repository browser