• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisionfd2cd59027979a03a93a2e91e942f1a4aa7c14d1 (tree)
Time2019-05-12 10:33:56
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 angband_sound_name と angband_music_basic_name を main-win.c へ移動.

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -103,8 +103,6 @@ extern concptr *quark__str;
103103 extern term *angband_term[8];
104104 extern const char angband_term_name[8][16];
105105 extern byte angband_color_table[256][4];
106-extern const concptr angband_sound_name[SOUND_MAX];
107-extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];
108106 extern FLOOR_IDX max_floor_id;
109107 extern u32b saved_floor_file_sign;
110108 extern concptr keymap_act[KEYMAP_MODES][256];
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -293,6 +293,109 @@
293293 #define MMNOMMIO /* Multimedia file I/O support */
294294 #define MMNOMMSYSTEM /* General MMSYSTEM functions */
295295
296+
297+ /*
298+ * Standard sound names
299+ */
300+const concptr angband_sound_name[SOUND_MAX] =
301+{
302+ "dummy",
303+ "hit",
304+ "miss",
305+ "flee",
306+ "drop",
307+ "kill",
308+ "level",
309+ "death",
310+ "study",
311+ "teleport",
312+ "shoot",
313+ "quaff",
314+ "zap",
315+ "walk",
316+ "tpother",
317+ "hitwall",
318+ "eat",
319+ "store1",
320+ "store2",
321+ "store3",
322+ "store4",
323+ "dig",
324+ "opendoor",
325+ "shutdoor",
326+ "tplevel",
327+ "scroll",
328+ "buy",
329+ "sell",
330+ "warn",
331+ "rocket",
332+ "n_kill",
333+ "u_kill",
334+ "quest",
335+ "heal",
336+ "x_heal",
337+ "bite",
338+ "claw",
339+ "m_spell",
340+ "summon",
341+ "breath",
342+ "ball",
343+ "m_heal",
344+ "atkspell",
345+ "evil",
346+ "touch",
347+ "sting",
348+ "crush",
349+ "slime",
350+ "wail",
351+ "winner",
352+ "fire",
353+ "acid",
354+ "elec",
355+ "cold",
356+ "illegal",
357+ "fail",
358+ "wakeup",
359+ "invuln",
360+ "fall",
361+ "pain",
362+ "destitem",
363+ "moan",
364+ "show",
365+ "unused",
366+ "explode",
367+ "glass",
368+ "reflect",
369+};
370+
371+/*
372+ * Standard music names
373+ */
374+const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
375+{
376+ "default",
377+ "gameover",
378+ "exit",
379+ "town",
380+ "field1",
381+ "field2",
382+ "field3",
383+ "dun_low",
384+ "dun_med",
385+ "dun_high",
386+ "feel1",
387+ "feel2",
388+ "winner",
389+ "build",
390+ "wild",
391+ "quest",
392+ "arena",
393+ "battle",
394+ "quest_clear",
395+ "final_quest_clear",
396+ "ambush",
397+};
398+
296399 /*
297400 * Include some more files. Note: the Cygnus Cygwin compiler
298401 * doesn't use mmsystem.h instead it includes the winmm library
--- a/src/variable.c
+++ b/src/variable.c
@@ -175,110 +175,6 @@ byte angband_color_table[256][4] =
175175 {0x00, 0xC0, 0x80, 0x40} /* TERM_L_UMBER */
176176 };
177177
178-
179-/*
180- * Standard sound names
181- */
182-const concptr angband_sound_name[SOUND_MAX] =
183-{
184- "dummy",
185- "hit",
186- "miss",
187- "flee",
188- "drop",
189- "kill",
190- "level",
191- "death",
192- "study",
193- "teleport",
194- "shoot",
195- "quaff",
196- "zap",
197- "walk",
198- "tpother",
199- "hitwall",
200- "eat",
201- "store1",
202- "store2",
203- "store3",
204- "store4",
205- "dig",
206- "opendoor",
207- "shutdoor",
208- "tplevel",
209- "scroll",
210- "buy",
211- "sell",
212- "warn",
213- "rocket",
214- "n_kill",
215- "u_kill",
216- "quest",
217- "heal",
218- "x_heal",
219- "bite",
220- "claw",
221- "m_spell",
222- "summon",
223- "breath",
224- "ball",
225- "m_heal",
226- "atkspell",
227- "evil",
228- "touch",
229- "sting",
230- "crush",
231- "slime",
232- "wail",
233- "winner",
234- "fire",
235- "acid",
236- "elec",
237- "cold",
238- "illegal",
239- "fail",
240- "wakeup",
241- "invuln",
242- "fall",
243- "pain",
244- "destitem",
245- "moan",
246- "show",
247- "unused",
248- "explode",
249- "glass",
250- "reflect",
251-};
252-
253-/*
254- * Standard music names
255- */
256-const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
257-{
258- "default",
259- "gameover",
260- "exit",
261- "town",
262- "field1",
263- "field2",
264- "field3",
265- "dun_low",
266- "dun_med",
267- "dun_high",
268- "feel1",
269- "feel2",
270- "winner",
271- "build",
272- "wild",
273- "quest",
274- "arena",
275- "battle",
276- "quest_clear",
277- "final_quest_clear",
278- "ambush",
279-};
280-
281-
282178 /*
283179 * Number of floor_id used from birth
284180 */
Show on old repository browser