• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision80b0539ba854bb2c9b79f708c450d917e8aad4af (tree)
Time2019-05-21 22:08:53
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 鍛冶に関するマクロ定義を cmd-smith.h へ移動.

Change Summary

Incremental Difference

--- a/src/artifact.c
+++ b/src/artifact.c
@@ -14,6 +14,7 @@
1414 #include "util.h"
1515
1616 #include "artifact.h"
17+#include "cmd-smith.h"
1718
1819 #include "avatar.h"
1920 #include "floor.h"
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -6,6 +6,7 @@
66 #include "object-hook.h"
77 #include "player-status.h"
88 #include "cmd-basic.h"
9+#include "cmd-smith.h"
910 #include "objectkind.h"
1011 #include "autopick.h"
1112
--- a/src/cmd-smith.h
+++ b/src/cmd-smith.h
@@ -1,4 +1,22 @@
11 #pragma once
22
3+/*
4+ * Special essence id for Weapon smith
5+ */
6+#define MIN_SPECIAL_ESSENCE 200
7+
8+#define ESSENCE_ATTACK (MIN_SPECIAL_ESSENCE + 0)
9+#define ESSENCE_AC (MIN_SPECIAL_ESSENCE + 1)
10+#define ESSENCE_TMP_RES_ACID (MIN_SPECIAL_ESSENCE + 2)
11+#define ESSENCE_TMP_RES_ELEC (MIN_SPECIAL_ESSENCE + 3)
12+#define ESSENCE_TMP_RES_FIRE (MIN_SPECIAL_ESSENCE + 4)
13+#define ESSENCE_TMP_RES_COLD (MIN_SPECIAL_ESSENCE + 5)
14+#define ESSENCE_SH_FIRE (MIN_SPECIAL_ESSENCE + 6)
15+#define ESSENCE_SH_ELEC (MIN_SPECIAL_ESSENCE + 7)
16+#define ESSENCE_SH_COLD (MIN_SPECIAL_ESSENCE + 8)
17+#define ESSENCE_RESISTANCE (MIN_SPECIAL_ESSENCE + 9)
18+#define ESSENCE_SUSTAIN (MIN_SPECIAL_ESSENCE + 10)
19+#define ESSENCE_SLAY_GLOVE (MIN_SPECIAL_ESSENCE + 11)
20+
321 extern concptr essence_name[];
422 extern void do_cmd_kaji(bool only_browse);
--- a/src/defines.h
+++ b/src/defines.h
@@ -2626,23 +2626,6 @@ extern int PlayerUID;
26262626 #define KNOW_STAT 0x01
26272627 #define KNOW_HPRATE 0x02
26282628
2629-/*
2630- * Special essence id for Weapon smith
2631- */
2632-#define MIN_SPECIAL_ESSENCE 200
2633-
2634-#define ESSENCE_ATTACK (MIN_SPECIAL_ESSENCE + 0)
2635-#define ESSENCE_AC (MIN_SPECIAL_ESSENCE + 1)
2636-#define ESSENCE_TMP_RES_ACID (MIN_SPECIAL_ESSENCE + 2)
2637-#define ESSENCE_TMP_RES_ELEC (MIN_SPECIAL_ESSENCE + 3)
2638-#define ESSENCE_TMP_RES_FIRE (MIN_SPECIAL_ESSENCE + 4)
2639-#define ESSENCE_TMP_RES_COLD (MIN_SPECIAL_ESSENCE + 5)
2640-#define ESSENCE_SH_FIRE (MIN_SPECIAL_ESSENCE + 6)
2641-#define ESSENCE_SH_ELEC (MIN_SPECIAL_ESSENCE + 7)
2642-#define ESSENCE_SH_COLD (MIN_SPECIAL_ESSENCE + 8)
2643-#define ESSENCE_RESISTANCE (MIN_SPECIAL_ESSENCE + 9)
2644-#define ESSENCE_SUSTAIN (MIN_SPECIAL_ESSENCE + 10)
2645-#define ESSENCE_SLAY_GLOVE (MIN_SPECIAL_ESSENCE + 11)
26462629
26472630
26482631 #define DUNGEON_FEAT_PROB_NUM 3
--- a/src/load.c
+++ b/src/load.c
@@ -83,6 +83,7 @@
8383 #include "save.h"
8484 #include "japanese.h"
8585 #include "realm-song.h"
86+#include "cmd-smith.h"
8687
8788 /*
8889 * Maximum number of tries for selection of a proper quest monster
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -13,6 +13,7 @@
1313 #include "angband.h"
1414 #include "util.h"
1515
16+#include "cmd-smith.h"
1617 #include "artifact.h"
1718 #include "player-status.h"
1819 #include "shoot.h"
--- a/src/object1.c
+++ b/src/object1.c
@@ -26,6 +26,7 @@
2626 #include "monster.h"
2727 #include "files.h"
2828 #include "term.h"
29+#include "cmd-smith.h"
2930
3031 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
3132 #ifdef verify
Show on old repository browser