Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier

diff --git a/lib/edit/Makefile.am b/lib/edit/Makefile.am
index c26d9a3..03f027e 100644 (file)
--- a/lib/edit/Makefile.am
+++ b/lib/edit/Makefile.am
@@ -9,8 +9,8 @@ angband_files = \
        q0000027.txt \
        q0000028.txt q00000ms.txt q000chao.txt q000dekn.txt \
        q000eric.txt q000lyeh.txt q000natu.txt q000sorc.txt \
-       q00water.txt q0clone0.txt q0fields.txt q0thief1.txt \
-       q0thief2.txt q0willow.txt q_info.txt q_oberon.txt \
+       q00water.txt q0clone0.txt q0dumpwitness.txt q0fields.txt \
+       q0thief1.txt q0thief2.txt q0willow.txt q_info.txt q_oberon.txt \
        q_pref.txt q_random.txt q_serpen.txt q_warg.txt \
        qdarkelf.txt qhaunted.txt r_info.txt t0000001.txt \
        t0000002.txt t0000003.txt t0000004.txt t0000005.txt \

diff --git a/lib/file/Makefile.am b/lib/file/Makefile.am
index e96b497..59658f0 100644 (file)
--- a/lib/file/Makefile.am
+++ b/lib/file/Makefile.am
@@ -12,7 +12,7 @@ angband_files = \
        chainswd.txt dead.txt \
        death.txt elvish.txt error.txt mondeath.txt \
        monfear.txt monfrien.txt monspeak.txt news.txt \
-       rumors.txt seppuku.txt silly.txt timefun.txt \
+       rumors.txt seppuku.txt silly.txt sname.txt timefun.txt \
        timenorm.txt w_cursed.txt w_high.txt w_low.txt\
        w_med.txt
 

diff --git a/lib/help/Makefile.am b/lib/help/Makefile.am
index 49c859f..a823db0 100644 (file)
--- a/lib/help/Makefile.am
+++ b/lib/help/Makefile.am
@@ -4,7 +4,7 @@ angband_files = \
        attack.hlp attack.txt birth.hlp birth.txt \
        bldg.txt raceclas.hlp raceclas.txt command.hlp \
        command.txt commdesc.hlp commdesc.txt editor.txt \
-       defend.hlp defend.txt dungeon.hlp dungeon.txt \
+       defend.hlp defend.txt dungeon.hlp dungeon.txt faq.txt \
        gambling.txt general.hlp general.txt help.hlp helpinfo.txt \
        j_general.txt j_item1.txt j_item2.txt j_trans.txt \
        jattack.hlp jattack.txt jbirth.hlp jbirth.txt \

diff --git a/lib/pref/Makefile.am b/lib/pref/Makefile.am
index 34772e7..efe4191 100644 (file)
--- a/lib/pref/Makefile.am
+++ b/lib/pref/Makefile.am
@@ -6,7 +6,7 @@ angband_files = \
        font-ami.prf font-dos.prf font-ibm.prf font-mac.prf \
        font-mon.prf font-win.prf font-x11.prf font-xxx.prf \
        font.prf graf-ami.prf graf-dos.prf graf-gcu.prf \
-       graf-ibm.prf graf-mac.prf graf-new.prf graf-win.prf \
+       graf-ibm.prf graf-mac.prf graf-new.prf graf-ne2.prf graf-win.prf \
        graf-x11.prf graf-xaw.prf graf-xxx.prf graf.prf \
        pref-acn.prf pref-ami.prf pref-emx.prf pref-gcu.prf \
        pref-key.prf pref-mac.prf pref-opt.prf pref-win.prf \

diff --git a/lib/xtra/sound/Makefile.am b/lib/xtra/sound/Makefile.am
index e8d86cd..bb6a189 100644 (file)
--- a/lib/xtra/sound/Makefile.am
+++ b/lib/xtra/sound/Makefile.am
@@ -1,4 +1,23 @@
 ## Makefile.am -- Process this file with automake to process Makefile.in
 
 EXTRA_DIST = \
-       sound.cfg
+       delete.me \
+       music.cfg \
+       sound.cfg \
+       $(sound_files)
+
+sound_files = \
+       se_maoudamashii_voice_monster01.wav
+       apple1-r.wav \
+       decision25r.wav \
+       drop1.wav \
+       enemy-advent1-r.wav \
+       sea-lion2-r.wav \
+       se_maoudamashii_battle07.wav \
+       se_maoudamashii_retro22.wav \
+       se_maoudamashii_se_drink01.wav \
+       se_maoudamashii_se_footstep01.wav \
+       sword-clash1-r.wav \
+       sword-drawn1-r.wav \
+       sword-gesture3-r.wav \
+       sword-slash3-r.wav

diff --git a/src/Makefile.am b/src/Makefile.am
index 5581c30..966f350 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,8 +34,8 @@ hengband_SOURCES = \
        mind.c mind.h \
        \
        monster.h monsterrace.c monsterrace.h \
-       monsterrace-hook.c monsterrace-hook.h monster-process.c \
-       monster-process.h monster-status.c monster-status.h monster1.c \
+       monsterrace-hook.c monsterrace-hook.h monster-process.c monster-process.h \
+       monster-status.c monster-status.h monster1.c \
        monster2.c mspells1.c mspells2.c mspells3.c mspells4.c monster-spell.h \
        \
        mutation.h mutation.c \
@@ -108,7 +108,10 @@ EXTRA_hengband_SOURCES = \
        makefile.bcc makefile.std makefile.dos makefile.ibm \
        readdib.c readdib.h wall.bmp
 
-COMPILE = ./gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+EXTRA_DIST = \
+       gcc-wrap
+
+COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -Icmd -Icombat
 
 install-exec-hook:

diff --git a/src/main-x11.c b/src/main-x11.c
index 10afdc3..7e4569a 100644 (file)
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -1914,7 +1914,7 @@ static errr CheckEvent(bool wait)
                XNextEvent(Metadpy->dpy, xev);
 
 #ifdef USE_XIM
-       } while (XFilterEvent(xev, xev->xany.window)
+       } while (XFilterEvent(xev, xev->xany.window));
 #endif
 
        /* Notice new keymaps */