• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision260e1770b3c5148c656e75313db65ef587de4a9f (tree)
Time2019-06-08 20:11:19
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 モンスターの時限ステータス定義を monster.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -103,24 +103,6 @@
103103 /* Maximum "Nazguls" number */
104104 #define MAX_NAZGUL_NUM 5
105105
106-#define MTIMED_CSLEEP 0 /* Monster is sleeping */
107-#define MTIMED_FAST 1 /* Monster is temporarily fast */
108-#define MTIMED_SLOW 2 /* Monster is temporarily slow */
109-#define MTIMED_STUNNED 3 /* Monster is stunned */
110-#define MTIMED_CONFUSED 4 /* Monster is confused */
111-#define MTIMED_MONFEAR 5 /* Monster is afraid */
112-#define MTIMED_INVULNER 6 /* Monster is temporarily invulnerable */
113-
114-#define MAX_MTIMED 7
115-
116-#define MON_CSLEEP(M_PTR) ((M_PTR)->mtimed[MTIMED_CSLEEP])
117-#define MON_FAST(M_PTR) ((M_PTR)->mtimed[MTIMED_FAST])
118-#define MON_SLOW(M_PTR) ((M_PTR)->mtimed[MTIMED_SLOW])
119-#define MON_STUNNED(M_PTR) ((M_PTR)->mtimed[MTIMED_STUNNED])
120-#define MON_CONFUSED(M_PTR) ((M_PTR)->mtimed[MTIMED_CONFUSED])
121-#define MON_MONFEAR(M_PTR) ((M_PTR)->mtimed[MTIMED_MONFEAR])
122-#define MON_INVULNER(M_PTR) ((M_PTR)->mtimed[MTIMED_INVULNER])
123-
124106 /*
125107 Language selection macro
126108 */
--- a/src/monster.h
+++ b/src/monster.h
@@ -6,6 +6,24 @@ typedef bool(*monsterrace_hook_type)(MONRACE_IDX r_idx);
66 extern MONSTER_IDX hack_m_idx;
77 extern MONSTER_IDX hack_m_idx_ii;
88
9+#define MTIMED_CSLEEP 0 /* Monster is sleeping */
10+#define MTIMED_FAST 1 /* Monster is temporarily fast */
11+#define MTIMED_SLOW 2 /* Monster is temporarily slow */
12+#define MTIMED_STUNNED 3 /* Monster is stunned */
13+#define MTIMED_CONFUSED 4 /* Monster is confused */
14+#define MTIMED_MONFEAR 5 /* Monster is afraid */
15+#define MTIMED_INVULNER 6 /* Monster is temporarily invulnerable */
16+
17+#define MAX_MTIMED 7
18+
19+#define MON_CSLEEP(M_PTR) ((M_PTR)->mtimed[MTIMED_CSLEEP])
20+#define MON_FAST(M_PTR) ((M_PTR)->mtimed[MTIMED_FAST])
21+#define MON_SLOW(M_PTR) ((M_PTR)->mtimed[MTIMED_SLOW])
22+#define MON_STUNNED(M_PTR) ((M_PTR)->mtimed[MTIMED_STUNNED])
23+#define MON_CONFUSED(M_PTR) ((M_PTR)->mtimed[MTIMED_CONFUSED])
24+#define MON_MONFEAR(M_PTR) ((M_PTR)->mtimed[MTIMED_MONFEAR])
25+#define MON_INVULNER(M_PTR) ((M_PTR)->mtimed[MTIMED_INVULNER])
26+
927 /*
1028 * Monster information, for a specific monster.
1129 * Note: fy, fx constrain dungeon size to 256x256
Show on old repository browser