• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision3392c6a6f6437cbda58ae6da8a07d534fa2d9d25 (tree)
Time2019-06-03 23:53:25
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 呪術領域用のマクロを realm-hex.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -372,17 +372,6 @@
372372 #define CONCENT_RADAR_THRESHOLD 2
373373 #define CONCENT_TELE_THRESHOLD 5
374374
375-/* Hex */
376-#define hex_spelling_any() \
377- ((p_ptr->realm1 == REALM_HEX) && (p_ptr->magic_num1[0]))
378-#define hex_spelling(X) \
379- ((p_ptr->realm1 == REALM_HEX) && (p_ptr->magic_num1[0] & (1L << (X))))
380-#define CASTING_HEX_FLAGS(P_PTR) ((P_PTR)->magic_num1[0])
381-#define CASTING_HEX_NUM(P_PTR) ((P_PTR)->magic_num2[0])
382-#define HEX_REVENGE_POWER(P_PTR) ((P_PTR)->magic_num1[2])
383-#define HEX_REVENGE_TURN(P_PTR) ((P_PTR)->magic_num2[2])
384-#define HEX_REVENGE_TYPE(P_PTR) ((P_PTR)->magic_num2[1])
385-
386375 /*
387376 Language selection macro
388377 */
--- a/src/realm-hex.h
+++ b/src/realm-hex.h
@@ -2,7 +2,18 @@
22 * @file realm-hex.h
33 */
44
5- /* 1st book */
5+ /* Hex */
6+#define hex_spelling_any() \
7+ ((p_ptr->realm1 == REALM_HEX) && (p_ptr->magic_num1[0]))
8+#define hex_spelling(X) \
9+ ((p_ptr->realm1 == REALM_HEX) && (p_ptr->magic_num1[0] & (1L << (X))))
10+#define CASTING_HEX_FLAGS(P_PTR) ((P_PTR)->magic_num1[0])
11+#define CASTING_HEX_NUM(P_PTR) ((P_PTR)->magic_num2[0])
12+#define HEX_REVENGE_POWER(P_PTR) ((P_PTR)->magic_num1[2])
13+#define HEX_REVENGE_TURN(P_PTR) ((P_PTR)->magic_num2[2])
14+#define HEX_REVENGE_TYPE(P_PTR) ((P_PTR)->magic_num2[1])
15+
16+/* 1st book */
617 #define HEX_BLESS 0
718 #define HEX_CURE_LIGHT 1
819 #define HEX_DEMON_AURA 2
Show on old repository browser