[Refactor] #40274 Unified angband_music_basic_name[] into main/music-definitions...

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index c56586c..e14bc32 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -152,6 +152,7 @@
     <ClCompile Include="..\..\src\autopick.c" />\r
     <ClCompile Include="..\..\src\avatar.c" />\r
     <ClCompile Include="..\..\src\birth.c" />\r
+    <ClCompile Include="..\..\src\main\music-definitions-table.c" />\r
     <ClCompile Include="..\..\src\main\sound-definitions-table.c" />\r
     <ClCompile Include="..\..\src\market\building.c" />\r
     <ClCompile Include="..\..\src\character-dump.c" />\r
@@ -275,6 +276,7 @@
     <ClInclude Include="..\..\src\autopick.h" />\r
     <ClInclude Include="..\..\src\avatar.h" />\r
     <ClInclude Include="..\..\src\birth.h" />\r
+    <ClInclude Include="..\..\src\main\music-definitions-table.h" />\r
     <ClInclude Include="..\..\src\main\sound-definitions-table.h" />\r
     <ClInclude Include="..\..\src\market\building.h" />\r
     <ClInclude Include="..\..\src\character-dump.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 20d7dc6..c1fcd65 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -589,6 +589,9 @@
     <ClCompile Include="..\..\src\main\sound-definitions-table.c">
       <Filter>main</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\main\music-definitions-table.c">
+      <Filter>main</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1160,6 +1163,9 @@
     <ClInclude Include="..\..\src\main\sound-definitions-table.h">
       <Filter>main</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\main\music-definitions-table.h">
+      <Filter>main</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e3288f..20fe55d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ hengband_SOURCES = \
        \
        avatar.h avatar.c birth.c birth.h \
        \
+       main/music-definitions-table.c main/music-definitions-table.h \
        main/sound-definitions-table.c main/sound-definitions-table.h \
        market/arena-info-table.c market/arena-info-table.h \
        market/building.c market/building.h \
@@ -170,7 +171,7 @@ hengband_SOURCES = \
 
 EXTRA_hengband_SOURCES = \
        angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \
-       makefile.bcc makefile.std readdib.c readdib.h wall.bmp
+       makefile.bcc makefile.std readdib.c readdib.h wall.bmp \
 
 EXTRA_DIST = \
        gcc-wrap

diff --git a/src/birth.c b/src/birth.c
index cab8c02..c136a21 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 #include "market/building.h"
 #include "core.h"
 #include "core/show-file.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 9ee1495..add169e 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "main/music-definitions-table.h"
 #include "core.h"
 #include "gameterm.h"
 

diff --git a/src/core.c b/src/core.c
index 580340a..c4fc413 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "signal-handlers.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 #include "core.h"
 #include "inet.h"
 #include "gameterm.h"

diff --git a/src/main-win.c b/src/main-win.c
index 93cb749..1ff231c 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -92,6 +92,7 @@
 #include "angband.h"
 #include "signal-handlers.h"
 #include "main/sound-definitions-table.h"
+#include "main/music-definitions-table.h"
 #include "util.h"
 #include "inet.h"
 #include "chuukei.h"
@@ -254,34 +255,6 @@
 #define MOUSE_SENS 40
 
 /*
- * Standard music names
- */
-const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
-{
-       "default",
-       "gameover",
-       "exit",
-       "town",
-       "field1",
-       "field2",
-       "field3",
-       "dun_low",
-       "dun_med",
-       "dun_high",
-       "feel1",
-       "feel2",
-       "winner",
-       "build",
-       "wild",
-       "quest",
-       "arena",
-       "battle",
-       "quest_clear",
-       "final_quest_clear",
-       "ambush",
-};
-
-/*
  * Include some more files. Note: the Cygnus Cygwin compiler
  * doesn't use mmsystem.h instead it includes the winmm library
  * which performs a similar function.

diff --git a/src/main/music-definitions-table.c b/src/main/music-definitions-table.c
new file mode 100644 (file)
index 0000000..6c8c358
--- /dev/null
+++ b/src/main/music-definitions-table.c
@@ -0,0 +1,27 @@
+#include "angband.h"
+#include "main/music-definitions-table.h"
+
+const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
+{
+       "default",
+       "gameover",
+       "exit",
+       "town",
+       "field1",
+       "field2",
+       "field3",
+       "dun_low",
+       "dun_med",
+       "dun_high",
+       "feel1",
+       "feel2",
+       "winner",
+       "build",
+       "wild",
+       "quest",
+       "arena",
+       "battle",
+       "quest_clear",
+       "final_quest_clear",
+       "ambush",
+};

diff --git a/src/main/music-definitions-table.h b/src/main/music-definitions-table.h
new file mode 100644 (file)
index 0000000..7a188d2
--- /dev/null
+++ b/src/main/music-definitions-table.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#define MUSIC_BASIC_DEFAULT    0
+#define MUSIC_BASIC_GAMEOVER   1
+#define MUSIC_BASIC_EXIT       2
+#define MUSIC_BASIC_TOWN       3
+#define MUSIC_BASIC_FIELD1     4
+#define MUSIC_BASIC_FIELD2     5
+#define MUSIC_BASIC_FIELD3     6
+#define MUSIC_BASIC_DUN_LOW    7
+#define MUSIC_BASIC_DUN_MED    8
+#define MUSIC_BASIC_DUN_HIGH   9
+#define MUSIC_BASIC_DUN_FEEL1 10
+#define MUSIC_BASIC_DUN_FEEL2 11
+#define MUSIC_BASIC_WINNER    12
+#define MUSIC_BASIC_BUILD     13
+#define MUSIC_BASIC_WILD      14
+#define MUSIC_BASIC_QUEST     15
+#define MUSIC_BASIC_ARENA     16
+#define MUSIC_BASIC_BATTLE    17
+#define MUSIC_BASIC_QUEST_CLEAR 18
+#define MUSIC_BASIC_FINAL_QUEST_CLEAR 19
+#define MUSIC_BASIC_AMBUSH    20
+#define MUSIC_BASIC_MAX       21 /*!< BGM定義の最大数 */
+
+extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];

diff --git a/src/market/building.c b/src/market/building.c
index 3d93309..2f5192c 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -14,6 +14,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 #include "gameterm.h"
 
 #include "core.h"

diff --git a/src/market/store.c b/src/market/store.c
index 909d68e..9bf5709 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -19,6 +19,7 @@
 #include "market/black-market.h"
 #include "core.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 #include "gameterm.h"
 
 #include "floor.h"

diff --git a/src/monster1.c b/src/monster1.c
index 9af6c9e..562001b 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 #include "gameterm.h"
 
 #include "io/write-diary.h"

diff --git a/src/player-damage.c b/src/player-damage.c
index 1fe704a..012412e 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "core.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 #include "gameterm.h"
 
 #include "avatar.h"

diff --git a/src/quest.c b/src/quest.c
index 95e2864..958df8a 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "util.h"
+#include "main/music-definitions-table.h"
 
 #include "core.h"
 #include "dungeon.h"

diff --git a/src/util.c b/src/util.c
index 6c5f3f5..7b1d26f 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -11,6 +11,7 @@
  /* Purpose: Angband utilities -BEN- */
 
 #include "angband.h"
+#include "main/music-definitions-table.h"
 #include "signal-handlers.h"
 #include "core.h"
 #include "gameterm.h"

diff --git a/src/util.h b/src/util.h
index b27d7cb..ba30417 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -166,31 +166,6 @@ extern s16b command_new;
 
 extern concptr keymap_act[KEYMAP_MODES][256];
 
-/*** Music constants ***/
-
-#define MUSIC_BASIC_DEFAULT    0
-#define MUSIC_BASIC_GAMEOVER   1
-#define MUSIC_BASIC_EXIT       2
-#define MUSIC_BASIC_TOWN       3
-#define MUSIC_BASIC_FIELD1     4
-#define MUSIC_BASIC_FIELD2     5
-#define MUSIC_BASIC_FIELD3     6
-#define MUSIC_BASIC_DUN_LOW    7
-#define MUSIC_BASIC_DUN_MED    8
-#define MUSIC_BASIC_DUN_HIGH   9
-#define MUSIC_BASIC_DUN_FEEL1 10
-#define MUSIC_BASIC_DUN_FEEL2 11
-#define MUSIC_BASIC_WINNER    12
-#define MUSIC_BASIC_BUILD     13
-#define MUSIC_BASIC_WILD      14
-#define MUSIC_BASIC_QUEST     15
-#define MUSIC_BASIC_ARENA     16
-#define MUSIC_BASIC_BATTLE    17
-#define MUSIC_BASIC_QUEST_CLEAR 18
-#define MUSIC_BASIC_FINAL_QUEST_CLEAR 19
-#define MUSIC_BASIC_AMBUSH    20
-#define MUSIC_BASIC_MAX       21 /*!< BGM定義の最大数 */
-
 /*** Sound constants ***/
 
 /*