• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision4440b4baa908712519b3b8030e4cae5599603a87 (tree)
Time2019-05-23 00:44:58
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 MUSIC_BASIC_* と SOUND_* を util.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -2301,110 +2301,6 @@ extern int PlayerUID;
23012301 */
23022302 #define is_ascii_graphics(A) (!((A) & 0x80))
23032303
2304-/*** Music constants ***/
2305-
2306-#define MUSIC_BASIC_DEFAULT 0
2307-#define MUSIC_BASIC_GAMEOVER 1
2308-#define MUSIC_BASIC_EXIT 2
2309-#define MUSIC_BASIC_TOWN 3
2310-#define MUSIC_BASIC_FIELD1 4
2311-#define MUSIC_BASIC_FIELD2 5
2312-#define MUSIC_BASIC_FIELD3 6
2313-#define MUSIC_BASIC_DUN_LOW 7
2314-#define MUSIC_BASIC_DUN_MED 8
2315-#define MUSIC_BASIC_DUN_HIGH 9
2316-#define MUSIC_BASIC_DUN_FEEL1 10
2317-#define MUSIC_BASIC_DUN_FEEL2 11
2318-#define MUSIC_BASIC_WINNER 12
2319-#define MUSIC_BASIC_BUILD 13
2320-#define MUSIC_BASIC_WILD 14
2321-#define MUSIC_BASIC_QUEST 15
2322-#define MUSIC_BASIC_ARENA 16
2323-#define MUSIC_BASIC_BATTLE 17
2324-#define MUSIC_BASIC_QUEST_CLEAR 18
2325-#define MUSIC_BASIC_FINAL_QUEST_CLEAR 19
2326-#define MUSIC_BASIC_AMBUSH 20
2327-#define MUSIC_BASIC_MAX 21 /*!< BGM定義の最大数 */
2328-
2329-/*** Sound constants ***/
2330-
2331-/*
2332- * Mega-Hack -- some primitive sound support (see "main-win.c")
2333- *
2334- * Some "sound" constants for "Term_xtra(TERM_XTRA_SOUND, val)"
2335- */
2336-#define SOUND_HIT 1
2337-#define SOUND_MISS 2
2338-#define SOUND_FLEE 3
2339-#define SOUND_DROP 4
2340-#define SOUND_KILL 5
2341-#define SOUND_LEVEL 6
2342-#define SOUND_DEATH 7
2343-#define SOUND_STUDY 8
2344-#define SOUND_TELEPORT 9
2345-#define SOUND_SHOOT 10
2346-#define SOUND_QUAFF 11
2347-#define SOUND_ZAP 12
2348-#define SOUND_WALK 13
2349-#define SOUND_TPOTHER 14
2350-#define SOUND_HITWALL 15
2351-#define SOUND_EAT 16
2352-#define SOUND_STORE1 17
2353-#define SOUND_STORE2 18
2354-#define SOUND_STORE3 19
2355-#define SOUND_STORE4 20
2356-#define SOUND_DIG 21
2357-#define SOUND_OPENDOOR 22
2358-#define SOUND_SHUTDOOR 23
2359-#define SOUND_TPLEVEL 24
2360-#define SOUND_SCROLL 25
2361-#define SOUND_BUY 26
2362-#define SOUND_SELL 27
2363-#define SOUND_WARN 28
2364-#define SOUND_ROCKET 29 /*!< Somebody's shooting rockets */
2365-#define SOUND_N_KILL 30 /*!< The player kills a non-living/undead monster */
2366-#define SOUND_U_KILL 31 /*!< The player kills a unique */
2367-#define SOUND_QUEST 32 /*!< The player has just completed a quest */
2368-#define SOUND_HEAL 33 /*!< The player was healed a little bit */
2369-#define SOUND_X_HEAL 34 /*!< The player was healed full health */
2370-#define SOUND_BITE 35 /*!< A monster bites you */
2371-#define SOUND_CLAW 36 /*!< A monster claws you */
2372-#define SOUND_M_SPELL 37 /*!< A monster casts a miscellaneous spell */
2373-#define SOUND_SUMMON 38 /*!< A monster casts a summoning spell */
2374-#define SOUND_BREATH 39 /*!< A monster breathes */
2375-#define SOUND_BALL 40 /*!< A monster casts a ball / bolt spell */
2376-#define SOUND_M_HEAL 41 /*!< A monster heals itself somehow */
2377-#define SOUND_ATK_SPELL 42 /*!< A monster casts a misc. offensive spell */
2378-#define SOUND_EVIL 43 /*!< Something nasty has just happened! */
2379-#define SOUND_TOUCH 44 /*!< A monster touches you */
2380-#define SOUND_STING 45 /*!< A monster stings you */
2381-#define SOUND_CRUSH 46 /*!< A monster crushes / envelopes you */
2382-#define SOUND_SLIME 47 /*!< A monster drools/spits/etc on you */
2383-#define SOUND_WAIL 48 /*!< A monster wails */
2384-#define SOUND_WINNER 49 /*!< Just won the game! */
2385-#define SOUND_FIRE 50 /*!< An item was burned */
2386-#define SOUND_ACID 51 /*!< An item was destroyed by acid */
2387-#define SOUND_ELEC 52 /*!< An item was destroyed by electricity */
2388-#define SOUND_COLD 53 /*!< An item was shattered */
2389-#define SOUND_ILLEGAL 54 /*!< Illegal command attempted */
2390-#define SOUND_FAIL 55 /*!< Fail to get a spell off / activate an item */
2391-#define SOUND_WAKEUP 56 /*!< A monster wakes up */
2392-#define SOUND_INVULN 57 /*!< Invulnerability! */
2393-#define SOUND_FALL 58 /*!< Falling through a trapdoor... */
2394-#define SOUND_PAIN 59 /*!< A monster is in pain! */
2395-#define SOUND_DESTITEM 60 /*!< An item was destroyed by misc. means */
2396-#define SOUND_MOAN 61 /*!< A monster makes a moan/beg/insult attack */
2397-#define SOUND_SHOW 62 /*!< A monster makes a "show" attack */
2398-#define SOUND_UNUSED 63 /*!< (no sound for gaze attacks) */
2399-#define SOUND_EXPLODE 64 /*!< Something (or somebody) explodes */
2400-#define SOUND_GLASS 65 /*!< A glass feature was crashed */
2401-#define SOUND_REFLECT 66 /*!< A bolt was reflected */
2402-
2403-/*
2404- * Mega-Hack -- maximum known sounds
2405- */
2406-#define SOUND_MAX 67 /*!< 効果音定義の最大数 */
2407-
24082304
24092305 /*** Hack ***/
24102306
--- a/src/util.h
+++ b/src/util.h
@@ -76,6 +76,110 @@ extern s16b command_new;
7676
7777 extern concptr keymap_act[KEYMAP_MODES][256];
7878
79+/*** Music constants ***/
80+
81+#define MUSIC_BASIC_DEFAULT 0
82+#define MUSIC_BASIC_GAMEOVER 1
83+#define MUSIC_BASIC_EXIT 2
84+#define MUSIC_BASIC_TOWN 3
85+#define MUSIC_BASIC_FIELD1 4
86+#define MUSIC_BASIC_FIELD2 5
87+#define MUSIC_BASIC_FIELD3 6
88+#define MUSIC_BASIC_DUN_LOW 7
89+#define MUSIC_BASIC_DUN_MED 8
90+#define MUSIC_BASIC_DUN_HIGH 9
91+#define MUSIC_BASIC_DUN_FEEL1 10
92+#define MUSIC_BASIC_DUN_FEEL2 11
93+#define MUSIC_BASIC_WINNER 12
94+#define MUSIC_BASIC_BUILD 13
95+#define MUSIC_BASIC_WILD 14
96+#define MUSIC_BASIC_QUEST 15
97+#define MUSIC_BASIC_ARENA 16
98+#define MUSIC_BASIC_BATTLE 17
99+#define MUSIC_BASIC_QUEST_CLEAR 18
100+#define MUSIC_BASIC_FINAL_QUEST_CLEAR 19
101+#define MUSIC_BASIC_AMBUSH 20
102+#define MUSIC_BASIC_MAX 21 /*!< BGM定義の最大数 */
103+
104+/*** Sound constants ***/
105+
106+/*
107+ * Mega-Hack -- some primitive sound support (see "main-win.c")
108+ *
109+ * Some "sound" constants for "Term_xtra(TERM_XTRA_SOUND, val)"
110+ */
111+#define SOUND_HIT 1
112+#define SOUND_MISS 2
113+#define SOUND_FLEE 3
114+#define SOUND_DROP 4
115+#define SOUND_KILL 5
116+#define SOUND_LEVEL 6
117+#define SOUND_DEATH 7
118+#define SOUND_STUDY 8
119+#define SOUND_TELEPORT 9
120+#define SOUND_SHOOT 10
121+#define SOUND_QUAFF 11
122+#define SOUND_ZAP 12
123+#define SOUND_WALK 13
124+#define SOUND_TPOTHER 14
125+#define SOUND_HITWALL 15
126+#define SOUND_EAT 16
127+#define SOUND_STORE1 17
128+#define SOUND_STORE2 18
129+#define SOUND_STORE3 19
130+#define SOUND_STORE4 20
131+#define SOUND_DIG 21
132+#define SOUND_OPENDOOR 22
133+#define SOUND_SHUTDOOR 23
134+#define SOUND_TPLEVEL 24
135+#define SOUND_SCROLL 25
136+#define SOUND_BUY 26
137+#define SOUND_SELL 27
138+#define SOUND_WARN 28
139+#define SOUND_ROCKET 29 /*!< Somebody's shooting rockets */
140+#define SOUND_N_KILL 30 /*!< The player kills a non-living/undead monster */
141+#define SOUND_U_KILL 31 /*!< The player kills a unique */
142+#define SOUND_QUEST 32 /*!< The player has just completed a quest */
143+#define SOUND_HEAL 33 /*!< The player was healed a little bit */
144+#define SOUND_X_HEAL 34 /*!< The player was healed full health */
145+#define SOUND_BITE 35 /*!< A monster bites you */
146+#define SOUND_CLAW 36 /*!< A monster claws you */
147+#define SOUND_M_SPELL 37 /*!< A monster casts a miscellaneous spell */
148+#define SOUND_SUMMON 38 /*!< A monster casts a summoning spell */
149+#define SOUND_BREATH 39 /*!< A monster breathes */
150+#define SOUND_BALL 40 /*!< A monster casts a ball / bolt spell */
151+#define SOUND_M_HEAL 41 /*!< A monster heals itself somehow */
152+#define SOUND_ATK_SPELL 42 /*!< A monster casts a misc. offensive spell */
153+#define SOUND_EVIL 43 /*!< Something nasty has just happened! */
154+#define SOUND_TOUCH 44 /*!< A monster touches you */
155+#define SOUND_STING 45 /*!< A monster stings you */
156+#define SOUND_CRUSH 46 /*!< A monster crushes / envelopes you */
157+#define SOUND_SLIME 47 /*!< A monster drools/spits/etc on you */
158+#define SOUND_WAIL 48 /*!< A monster wails */
159+#define SOUND_WINNER 49 /*!< Just won the game! */
160+#define SOUND_FIRE 50 /*!< An item was burned */
161+#define SOUND_ACID 51 /*!< An item was destroyed by acid */
162+#define SOUND_ELEC 52 /*!< An item was destroyed by electricity */
163+#define SOUND_COLD 53 /*!< An item was shattered */
164+#define SOUND_ILLEGAL 54 /*!< Illegal command attempted */
165+#define SOUND_FAIL 55 /*!< Fail to get a spell off / activate an item */
166+#define SOUND_WAKEUP 56 /*!< A monster wakes up */
167+#define SOUND_INVULN 57 /*!< Invulnerability! */
168+#define SOUND_FALL 58 /*!< Falling through a trapdoor... */
169+#define SOUND_PAIN 59 /*!< A monster is in pain! */
170+#define SOUND_DESTITEM 60 /*!< An item was destroyed by misc. means */
171+#define SOUND_MOAN 61 /*!< A monster makes a moan/beg/insult attack */
172+#define SOUND_SHOW 62 /*!< A monster makes a "show" attack */
173+#define SOUND_UNUSED 63 /*!< (no sound for gaze attacks) */
174+#define SOUND_EXPLODE 64 /*!< Something (or somebody) explodes */
175+#define SOUND_GLASS 65 /*!< A glass feature was crashed */
176+#define SOUND_REFLECT 66 /*!< A bolt was reflected */
177+
178+ /*
179+ * Mega-Hack -- maximum known sounds
180+ */
181+#define SOUND_MAX 67 /*!< 効果音定義の最大数 */
182+
79183
80184 /*
81185 * Hack -- The main "screen"
Show on old repository browser