[Refactor] ソース整形、サウンド調整中。 / Source preformatting and adjust sounds.

diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg
index c026786..8a62c6f 100644 (file)
--- a/lib/xtra/sound/sound.cfg
+++ b/lib/xtra/sound/sound.cfg
@@ -18,8 +18,8 @@ miss = sword-gesture3-r.wav
 flee = flee.wav
 drop = clunk.wav
 kill = se_maoudamashii_retro22.wav
-level = level.wav 
-death = death.wav
+level = decision25r.wav
+death = drop1.wav
 study = 
 teleport =
 shoot = 

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/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},