• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisiondbef4b71d13e3120239a2ce332866981b7d0833f (tree)
Time2019-05-21 00:16:51
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 TERM_* 定義を term.h へ移動.

Change Summary

Incremental Difference

--- a/src/autopick.c
+++ b/src/autopick.c
@@ -13,6 +13,7 @@
1313
1414 #include "angband.h"
1515 #include "util.h"
16+#include "term.h"
1617 #include "autopick.h"
1718 #include "core.h"
1819
--- a/src/birth.c
+++ b/src/birth.c
@@ -15,6 +15,7 @@
1515 #include "util.h"
1616 #include "bldg.h"
1717 #include "core.h"
18+#include "term.h"
1819
1920 #include "artifact.h"
2021 #include "avatar.h"
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -13,6 +13,7 @@
1313 #include "angband.h"
1414 #include "util.h"
1515 #include "core.h"
16+#include "term.h"
1617
1718 #include "cmd-dump.h"
1819 #include "chest.h"
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -54,6 +54,7 @@
5454
5555 #include "angband.h"
5656 #include "util.h"
57+#include "term.h"
5758
5859 #include "cmd-basic.h"
5960 #include "cmd-usestaff.h"
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -1,5 +1,6 @@
11 #include "angband.h"
22 #include "util.h"
3+#include "term.h"
34
45 #include "object-flavor.h"
56 #include "object-hook.h"
--- a/src/defines.h
+++ b/src/defines.h
@@ -2416,31 +2416,6 @@ extern int PlayerUID;
24162416
24172417 /*** Color constants ***/
24182418
2419-
2420-/*
2421- * Angband "attributes" (with symbols, and base (R,G,B) codes)
2422- *
2423- * The "(R,G,B)" codes are given in "fourths" of the "maximal" value,
2424- * and should "gamma corrected" on most (non-Macintosh) machines.
2425- */
2426-#define TERM_DARK 0 /*!< 'd' - 黒 0,0,0 */
2427-#define TERM_WHITE 1 /*!< 'w' - 白 4,4,4 */
2428-#define TERM_SLATE 2 /*!< 's' - 灰 2,2,2 */
2429-#define TERM_ORANGE 3 /*!< 'o' - 橙 4,2,0 */
2430-#define TERM_RED 4 /*!< 'r' - 赤 3,0,0 */
2431-#define TERM_GREEN 5 /*!< 'g' - 緑 0,2,1 */
2432-#define TERM_BLUE 6 /*!< 'b' - 青 0,0,4 */
2433-#define TERM_UMBER 7 /*!< 'u' - 琥珀 2,1,0 */
2434-#define TERM_L_DARK 8 /*!< 'D' - 暗い灰 1,1,1 */
2435-#define TERM_L_WHITE 9 /*!< 'W' - 明るい灰 3,3,3 */
2436-#define TERM_VIOLET 10 /*!< 'v' - 紫 4,0,4 */
2437-#define TERM_YELLOW 11 /*!< 'y' - 黄 4,4,0 */
2438-#define TERM_L_RED 12 /*!< 'R' - 明るい赤 4,0,0 */
2439-#define TERM_L_GREEN 13 /*!< 'G' - 明るい緑 0,4,0 */
2440-#define TERM_L_BLUE 14 /*!< 'B' - 明るい青 0,4,4 */
2441-#define TERM_L_UMBER 15 /*!< 'U' - 明るい琥珀 3,2,1 */
2442-
2443-
24442419 /*
24452420 * Not using graphical tiles for this feature?
24462421 */
--- a/src/grid.c
+++ b/src/grid.c
@@ -19,6 +19,7 @@
1919
2020 #include "angband.h"
2121 #include "util.h"
22+#include "term.h"
2223
2324 #include "floor.h"
2425 #include "world.h"
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "util.h"
15+#include "term.h"
1516
1617 #include "cmd-dump.h"
1718 #include "bldg.h"
--- a/src/object2.c
+++ b/src/object2.c
@@ -14,6 +14,7 @@
1414 #include "angband.h"
1515 #include "util.h"
1616 #include "world.h"
17+#include "term.h"
1718
1819 #include "object.h"
1920
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -13,6 +13,7 @@
1313 */
1414
1515 #include "angband.h"
16+#include "term.h"
1617 #include "core.h"
1718 #include "util.h"
1819
--- a/src/scores.c
+++ b/src/scores.c
@@ -11,6 +11,7 @@
1111 */
1212
1313 #include "angband.h"
14+#include "term.h"
1415 #include "util.h"
1516 #include "core.h"
1617
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -1,6 +1,7 @@
11 #include "angband.h"
22 #include "core.h"
33 #include "util.h"
4+#include "term.h"
45
56 #include "monster.h"
67 #include "monster-status.h"
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -9,6 +9,7 @@
99 #include "angband.h"
1010 #include "core.h"
1111 #include "util.h"
12+#include "term.h"
1213
1314 #include "player-status.h"
1415 #include "cmd-basic.h"
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -14,6 +14,7 @@
1414 #include "angband.h"
1515 #include "bldg.h"
1616 #include "core.h"
17+#include "term.h"
1718 #include "util.h"
1819
1920 #include "creature.h"
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -14,6 +14,7 @@
1414 #include "angband.h"
1515 #include "util.h"
1616 #include "core.h"
17+#include "term.h"
1718 #include "targeting.h"
1819
1920 #include "bldg.h"
--- a/src/term.h
+++ b/src/term.h
@@ -2,6 +2,29 @@
22
33 #include "spells.h"
44
5+/*
6+ * Angband "attributes" (with symbols, and base (R,G,B) codes)
7+ *
8+ * The "(R,G,B)" codes are given in "fourths" of the "maximal" value,
9+ * and should "gamma corrected" on most (non-Macintosh) machines.
10+ */
11+#define TERM_DARK 0 /*!< 'd' - 黒 0,0,0 */
12+#define TERM_WHITE 1 /*!< 'w' - 白 4,4,4 */
13+#define TERM_SLATE 2 /*!< 's' - 灰 2,2,2 */
14+#define TERM_ORANGE 3 /*!< 'o' - 橙 4,2,0 */
15+#define TERM_RED 4 /*!< 'r' - 赤 3,0,0 */
16+#define TERM_GREEN 5 /*!< 'g' - 緑 0,2,1 */
17+#define TERM_BLUE 6 /*!< 'b' - 青 0,0,4 */
18+#define TERM_UMBER 7 /*!< 'u' - 琥珀 2,1,0 */
19+#define TERM_L_DARK 8 /*!< 'D' - 暗い灰 1,1,1 */
20+#define TERM_L_WHITE 9 /*!< 'W' - 明るい灰 3,3,3 */
21+#define TERM_VIOLET 10 /*!< 'v' - 紫 4,0,4 */
22+#define TERM_YELLOW 11 /*!< 'y' - 黄 4,4,0 */
23+#define TERM_L_RED 12 /*!< 'R' - 明るい赤 4,0,0 */
24+#define TERM_L_GREEN 13 /*!< 'G' - 明るい緑 0,4,0 */
25+#define TERM_L_BLUE 14 /*!< 'B' - 明るい青 0,4,4 */
26+#define TERM_L_UMBER 15 /*!< 'U' - 明るい琥珀 3,2,1 */
27+
528 extern const concptr color_names[16];
629 extern const concptr window_flag_desc[32];
730 extern const concptr ident_info[];
--- a/src/util.c
+++ b/src/util.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "core.h"
15+#include "term.h"
1516 #include "util.h"
1617 #include "files.h"
1718 #include "monsterrace-hook.h"
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "util.h"
15+#include "term.h"
1516
1617 #include "artifact.h"
1718 #include "sort.h"
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "core.h"
15+#include "term.h"
1516
1617 #include "dungeon.h"
1718 #include "cmd-dump.h"
--- a/src/z-term.c
+++ b/src/z-term.c
@@ -11,6 +11,7 @@
1111 /* Purpose: a generic, efficient, terminal window package -BEN- */
1212 #include "angband.h"
1313
14+#include "term.h"
1415 #include "z-term.h"
1516
1617 #include "z-virt.h"
Show on old repository browser