Merge branch 'sound'

diff --git a/doxygen/Hengband.doxyfile b/doxygen/Hengband.doxyfile
index fe7fbbf..e918902 100644 (file)
--- a/doxygen/Hengband.doxyfile
+++ b/doxygen/Hengband.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Hengband
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.2.0-FixWinWarnings
+PROJECT_NUMBER         = 2.2.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -2046,7 +2046,7 @@ PERL_PATH              = /usr/bin/perl
 # powerful graphs.
 # The default value is: YES.
 
-CLASS_DIAGRAMS         = YES
+CLASS_DIAGRAMS         = NO
 
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see:
@@ -2077,7 +2077,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = YES
+HAVE_DOT               = NO
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of

diff --git a/lib/xtra/.gitattributes b/lib/xtra/.gitattributes
new file mode 100644 (file)
index 0000000..b88032e
--- /dev/null
+++ b/lib/xtra/.gitattributes
@@ -0,0 +1,3 @@
+*.wav -diff -text\r
+*.bmp -diff -text\r
+*.png -diff -text\r

diff --git a/lib/xtra/sound/apple1-r.wav b/lib/xtra/sound/apple1-r.wav
new file mode 100644 (file)
index 0000000..6e1375b
Binary files /dev/null and b/lib/xtra/sound/apple1-r.wav differ

diff --git a/lib/xtra/sound/decision25r.wav b/lib/xtra/sound/decision25r.wav
new file mode 100644 (file)
index 0000000..4ab5c66
Binary files /dev/null and b/lib/xtra/sound/decision25r.wav differ

diff --git a/lib/xtra/sound/drop1.wav b/lib/xtra/sound/drop1.wav
new file mode 100644 (file)
index 0000000..660b6d7
Binary files /dev/null and b/lib/xtra/sound/drop1.wav differ

diff --git a/lib/xtra/sound/enemy-advent1-r.wav b/lib/xtra/sound/enemy-advent1-r.wav
new file mode 100644 (file)
index 0000000..f0c616e
Binary files /dev/null and b/lib/xtra/sound/enemy-advent1-r.wav differ

diff --git a/lib/xtra/sound/readme.txt b/lib/xtra/sound/readme.txt
new file mode 100644 (file)
index 0000000..080b966
--- /dev/null
+++ b/lib/xtra/sound/readme.txt
@@ -0,0 +1,7 @@
+\8c»\8dÝ\97\98\97p\82µ\82Ä\82¢\82é\8cø\89Ê\89¹\91f\8dÞ(\89Á\8dH\92²\90®\8aÜ)\82Ì\94z\95z\8c³\82Å\82·\81B\r
+\r
+\96\82\89¤\8d° \97l\r
+https://maoudamashii.jokersounds.com/\r
+\r
+\8cø\89Ê\89¹\83\89\83{ \97l\r
+https://soundeffect-lab.info/\r

diff --git a/lib/xtra/sound/se_maoudamashii_battle07.wav b/lib/xtra/sound/se_maoudamashii_battle07.wav
new file mode 100644 (file)
index 0000000..914a4e3
Binary files /dev/null and b/lib/xtra/sound/se_maoudamashii_battle07.wav differ

diff --git a/lib/xtra/sound/se_maoudamashii_retro22.wav b/lib/xtra/sound/se_maoudamashii_retro22.wav
new file mode 100644 (file)
index 0000000..f5dfcc4
Binary files /dev/null and b/lib/xtra/sound/se_maoudamashii_retro22.wav differ

diff --git a/lib/xtra/sound/se_maoudamashii_se_drink01.wav b/lib/xtra/sound/se_maoudamashii_se_drink01.wav
new file mode 100644 (file)
index 0000000..1a8e1b4
Binary files /dev/null and b/lib/xtra/sound/se_maoudamashii_se_drink01.wav differ

diff --git a/lib/xtra/sound/se_maoudamashii_se_footstep01.wav b/lib/xtra/sound/se_maoudamashii_se_footstep01.wav
new file mode 100644 (file)
index 0000000..3954e27
Binary files /dev/null and b/lib/xtra/sound/se_maoudamashii_se_footstep01.wav differ

diff --git a/lib/xtra/sound/se_maoudamashii_voice_monster01.wav b/lib/xtra/sound/se_maoudamashii_voice_monster01.wav
new file mode 100644 (file)
index 0000000..acb85fe
Binary files /dev/null and b/lib/xtra/sound/se_maoudamashii_voice_monster01.wav differ

diff --git a/lib/xtra/sound/sea-lion2-r.wav b/lib/xtra/sound/sea-lion2-r.wav
new file mode 100644 (file)
index 0000000..998a921
Binary files /dev/null and b/lib/xtra/sound/sea-lion2-r.wav differ

diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg
index 2acde15..d3e0437 100644 (file)
--- a/lib/xtra/sound/sound.cfg
+++ b/lib/xtra/sound/sound.cfg
@@ -12,30 +12,31 @@
 # all the available event names.
 
 [Sound]
-hit = hit.wav drop.wav hit1.wav
-miss = miss.wav miss1.wav
-flee = flee.wav
-drop = clunk.wav
-kill = kill.wav destroy.wav kill1.wav
-level = level.wav 
-death = death.wav
+player_combat_start = sword-drawn1-r.wav
+hit = sword-slash3-r.wav
+miss = sword-gesture3-r.wav
+flee = sea-lion2-r.wav
+drop = 
+kill = se_maoudamashii_retro22.wav
+level = decision25r.wav
+death = drop1.wav
 study = 
 teleport =
 shoot = 
-quaff = 
+quaff = se_maoudamashii_se_drink01.wav
 zap =
-walk = 
+walk = se_maoudamashii_se_footstep01.wav 
 tpother =
 hitwall = se_maoudamashii_battle07.wav
-eat = eat.wav
-store1 = money.wav
-store2 = money.wav
-store3 = money.wav
-store4 = money.wav
-dig = thump.wav
-opendoor = opendoor.wav
-shutdoor = shutdoor.wav
-tplevel = teleport.wav
+eat = apple1-r.wav
+store1 = 
+store2 = 
+store3 = 
+store4 = 
+dig = 
+opendoor =
+shutdoor =
+tplevel =
 scroll =
 buy =
 sell =
@@ -49,7 +50,6 @@ x_heal =
 bite =
 claw =
 m_spell =
-summon =
 breath =
 ball =
 m_heal =
@@ -77,5 +77,5 @@ show =
 unused =
 explode =
 glass =
-summon =
-reflect =
+summon = enemy-advent1-r.wav
+reflect = sword-clash1-r.wav

diff --git a/lib/xtra/sound/sword-clash1-r.wav b/lib/xtra/sound/sword-clash1-r.wav
new file mode 100644 (file)
index 0000000..b3a23ac
Binary files /dev/null and b/lib/xtra/sound/sword-clash1-r.wav differ

diff --git a/lib/xtra/sound/sword-drawn1-r.wav b/lib/xtra/sound/sword-drawn1-r.wav
new file mode 100644 (file)
index 0000000..808cccf
Binary files /dev/null and b/lib/xtra/sound/sword-drawn1-r.wav differ

diff --git a/lib/xtra/sound/sword-gesture3-r.wav b/lib/xtra/sound/sword-gesture3-r.wav
new file mode 100644 (file)
index 0000000..59786c9
Binary files /dev/null and b/lib/xtra/sound/sword-gesture3-r.wav differ

diff --git a/lib/xtra/sound/sword-slash3-r.wav b/lib/xtra/sound/sword-slash3-r.wav
new file mode 100644 (file)
index 0000000..21cd8a1
Binary files /dev/null and b/lib/xtra/sound/sword-slash3-r.wav differ

diff --git a/src/main-win.c b/src/main-win.c
index 9913fd8..a318c57 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -647,13 +647,11 @@ static TERM_POSITION mousex = 0, mousey = 0;
 static TERM_POSITION oldx, oldy;\r
 \r
 \r
-/*\r
- * The "simple" color values\r
- *\r
+/*!\r
+ * @brief The "simple" color values\r
+ * @details\r
  * See "main-ibm.c" for original table information\r
- *\r
  * The entries below are taken from the "color bits" defined above.\r
- *\r
  * Note that many of the choices below suck, but so do crappy monitors.\r
  */\r
 static BYTE win_pal[256] =\r

diff --git a/src/monster2.c b/src/monster2.c
index 8c3fcb2..f5d71f1 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -4047,6 +4047,7 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t
 
        summon_specific_type = 0;
        /* Success */
+       sound(SOUND_SUMMON);
        return (TRUE);
 }
 

diff --git a/src/spells1.c b/src/spells1.c
index 6d2da94..42d5d86 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -5218,6 +5218,7 @@ static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT
        {
                POSITION t_y, t_x;
                int max_attempts = 10;
+               sound(SOUND_REFLECT);
 
                if (blind) 
                        msg_print(_("何かが跳ね返った！", "Something bounces!"));
@@ -7604,6 +7605,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                                t_x = x_saver;
                                        }
 
+                                       sound(SOUND_REFLECT);
                                        if (is_seen(m_ptr))
                                        {
                                                if ((m_ptr->r_idx == MON_KENSHIROU) || (m_ptr->r_idx == MON_RAOU))

diff --git a/src/tables.c b/src/tables.c
index 6e95b54..9bafc57 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1428,30 +1428,30 @@ const owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "獣マスターのエディー", 25000,  190,  115,   5,   7,  RACE_HOBBIT},
                { "竜殺しのオグライン", 30000,  195,  112,   4,   8,  RACE_DWARF},
                { "熟練者ドリュー",      10000,   210, 115,  6,  6, RACE_HUMAN},
-               {"龍の子オラックス",        15000,  185, 110,  5,  9, RACE_DRACONIAN},
+               { "龍の子オラックス",        15000,  185, 110,  5,  9, RACE_DRACONIAN},
                { "病気持ちのアンスラックス",         25000,  190, 115,  5,  7, RACE_BEASTMAN},
                { "頑丈者アルコス",       30000,  195, 112,  4,  8, RACE_DWARF},
                { "腐れ者のサリアス",      5000,   210, 115,  6,  6, RACE_ZOMBIE},
-               {"晒し骨のトゥエシク",        15000,  185, 110,  5,  9, RACE_SKELETON},
+               { "晒し骨のトゥエシク",        15000,  185, 110,  5,  9, RACE_SKELETON},
                { "ビリオス",         25000,  190, 115,  5,  7, RACE_BEASTMAN},
                { "ファスガル",       30000,  195, 112,  4,  8, RACE_ZOMBIE},
                { "パラディンのエレフリス",      10000,   210, 115,  6,  6, RACE_BARBARIAN},
-               {"キ'トリッ'ク",        15000,  185, 110,  5,  9, RACE_KLACKON},
+               { "キ'トリッ'ク",        15000,  185, 110,  5,  9, RACE_KLACKON},
                { "蜘蛛の友ドゥロカス",         25000,  190, 115,  5,  7, RACE_DARK_ELF},
                { "巨人殺しのフングス",       30000,  195, 112,  4,  8, RACE_DWARF},
                { "デランサ",      10000,   210, 115,  6,  6, RACE_ELF},
-               {"レンジャーのソルビスタニ",        15000,  185, 110,  5,  9, RACE_HALF_ELF},
+               { "レンジャーのソルビスタニ",        15000,  185, 110,  5,  9, RACE_HALF_ELF},
                { "ノロマのゾリル",         25000,  190, 115,  5,  7, RACE_GOLEM},
                { "イーオン・フラックス",       20000,  195, 112,  4,  8, RACE_HALF_ELF},
                { "強者ナドック",      10000,   210, 115,  6,  6, RACE_HOBBIT},
-               {"弱虫エラモグ",        15000,  185, 110,  5,  9, RACE_KOBOLD},
+               { "弱虫エラモグ",        15000,  185, 110,  5,  9, RACE_KOBOLD},
                { "公正なエオウィリス",         25000,  190, 115,  5,  7, RACE_VAMPIRE},
                { "バルログ殺しのヒュイモグ",       30000,  195, 112,  4,  8, RACE_HALF_ORC},
                { "冷酷ピーダス",      5000,   210, 115,  6,  6, RACE_HUMAN},
                { "ヴァモグ スレイヤー",        15000,  185, 110,  5,  9, RACE_HALF_OGRE},
                { "性悪フーシュナク",         25000,  190, 115,  5,  7, RACE_BEASTMAN},
                { "舞闘バレン",       30000,  195, 112,  4,  8, RACE_BARBARIAN},
-               { " 残忍なるアーノルド",      5000,   210, 115,  6,  6, RACE_BARBARIAN},
+               { "残忍なるアーノルド",      5000,   210, 115,  6,  6, RACE_BARBARIAN},
                { "獣殺しのアーンダル",        10000,  185, 110,  5,  9, RACE_HALF_ELF},
                { "ビーストマスター・エディー",         25000,  190, 115,  5,  7, RACE_HALF_ORC},
                { "竜殺しのオグライン",       30000,  195, 112,  4,  8, RACE_DWARF},
@@ -1461,23 +1461,23 @@ const owner_type owners[MAX_STORES][MAX_OWNERS] =
                { "Eddie Beast-Master",         25000,  190, 115,  5,  7, RACE_HALF_ORC},
                { "Oglign Dragon-Slayer",       30000,  195, 112,  4,  8, RACE_DWARF},
                { "Drew the Skilled",      10000,   210, 115,  6,  6, RACE_HUMAN},
-               {"Orrax Dragonson",        15000,  185, 110,  5,  9, RACE_DRACONIAN},
+               { "Orrax Dragonson",        15000,  185, 110,  5,  9, RACE_DRACONIAN},
                { "Anthrax Disease-Carrier",         25000,  190, 115,  5,  7, RACE_BEASTMAN},
                { "Arkhoth the Stout",       30000,  195, 112,  4,  8, RACE_DWARF},
                { "Sarlyas the Rotten",      5000,   210, 115,  6,  6, RACE_ZOMBIE},
-               {"Tuethic Bare-Bones",        15000,  185, 110,  5,  9, RACE_SKELETON},
+               { "Tuethic Bare-Bones",        15000,  185, 110,  5,  9, RACE_SKELETON},
                { "Bilious",         25000,  190, 115,  5,  7, RACE_BEASTMAN},
                { "Fasgul",       30000,  195, 112,  4,  8, RACE_ZOMBIE},
                { "Ellefris the Paladin",      10000,   210, 115,  6,  6, RACE_BARBARIAN},
-               {"K'trrik'k",        15000,  185, 110,  5,  9, RACE_KLACKON},
+               { "K'trrik'k",        15000,  185, 110,  5,  9, RACE_KLACKON},
                { "Drocus Spiderfriend",         25000,  190, 115,  5,  7, RACE_DARK_ELF},
                { "Fungus Giant-Slayer",       30000,  195, 112,  4,  8, RACE_DWARF},
                { "Delantha",      10000,   210, 115,  6,  6, RACE_ELF},
-               {"Solvistani the Ranger",        15000,  185, 110,  5,  9, RACE_HALF_ELF},
+               { "Solvistani the Ranger",        15000,  185, 110,  5,  9, RACE_HALF_ELF},
                { "Xoril the Slow",         25000,  190, 115,  5,  7, RACE_GOLEM},
                { "Aeon Flux",       20000,  195, 112,  4,  8, RACE_HALF_ELF},
                { "Nadoc the Strong",      10000,   210, 115,  6,  6, RACE_HOBBIT},
-               {"Eramog the Weak",        15000,  185, 110,  5,  9, RACE_KOBOLD},
+               { "Eramog the Weak",        15000,  185, 110,  5,  9, RACE_KOBOLD},
                { "Eowilith the Fair",         25000,  190, 115,  5,  7, RACE_VAMPIRE},
                { "Huimog Balrog-Slayer",       30000,  195, 112,  4,  8, RACE_HALF_ORC},
                { "Peadus the Cruel",      5000,   210, 115,  6,  6, RACE_HUMAN},