• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisiona52760573ae4bbaab3b9f84e03660d5478fb7cbb (tree)
Time2019-06-02 15:49:29
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 PICT, PICT_A, PICT_C を term.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -297,27 +297,6 @@
297297 ((bool)((A)->ml && (!ignore_unview || p_ptr->inside_battle || \
298298 (player_can_see_bold((A)->fy, (A)->fx) && projectable(p_ptr->y, p_ptr->x, (A)->fy, (A)->fx)))))
299299
300-
301-/*** Macro Definitions ***/
302-/*
303- * Convert an "attr"/"char" pair into a "pict" (P)
304- */
305-#define PICT(A,C) \
306- ((((u16b)(A)) << 8) | ((byte)(C)))
307-
308-/*
309- * Convert a "pict" (P) into an "attr" (A)
310- */
311-#define PICT_A(P) \
312- ((byte)((P) >> 8))
313-
314-/*
315- * Convert a "pict" (P) into an "char" (C)
316- */
317-#define PICT_C(P) \
318- ((char)((byte)(P)))
319-
320-
321300 /*
322301 * Hack -- Prepare to use the "Secure" routines
323302 */
--- a/src/spells.h
+++ b/src/spells.h
@@ -139,7 +139,6 @@ extern const magic_type technic_info[NUM_TECHNIC][32];
139139 extern PERCENTAGE beam_chance(void);
140140 extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
141141 extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ);
142-extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ);
143142 extern POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
144143
145144 #define PROJECT_WHO_UNCTRL_POWER -1 /*!< 魔法効果の自然発生要因: 名状し難い力の解放 */
--- a/src/term.h
+++ b/src/term.h
@@ -25,6 +25,25 @@
2525 #define TERM_L_BLUE 14 /*!< 'B' - 明るい青 0,4,4 */
2626 #define TERM_L_UMBER 15 /*!< 'U' - 明るい琥珀 3,2,1 */
2727
28+ /*** Macro Definitions ***/
29+ /*
30+ * Convert an "attr"/"char" pair into a "pict" (P)
31+ */
32+#define PICT(A,C) \
33+ ((((u16b)(A)) << 8) | ((byte)(C)))
34+
35+ /*
36+ * Convert a "pict" (P) into an "attr" (A)
37+ */
38+#define PICT_A(P) \
39+ ((byte)((P) >> 8))
40+
41+ /*
42+ * Convert a "pict" (P) into an "char" (C)
43+ */
44+#define PICT_C(P) \
45+ ((char)((byte)(P)))
46+
2847 extern const concptr color_names[16];
2948 extern const concptr window_flag_desc[32];
3049 extern const concptr ident_info[];
Show on old repository browser