From 7e60bfb83fb05786084df560330aec0a7e8e5a5b Mon Sep 17 00:00:00 2001 From: Hourier Date: Mon, 20 Jan 2020 22:29:04 +0900 Subject: [PATCH] =?utf8?q?[Fix]=20#39673=20TaoTao=E6=B0=8F=E3=81=AB?= =?utf8?q?=E3=82=88=E3=82=8B=E3=80=81Linux=E3=81=A7=E3=82=B3=E3=83=B3?= =?utf8?q?=E3=83=91=E3=82=A4=E3=83=AB=E3=81=8C=E9=80=9A=E3=82=8B=E3=82=88?= =?utf8?q?=E3=81=86=E3=81=ABMakefile.am=20=E3=81=9D=E3=81=AE=E4=BB=96?= =?utf8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=20/=20Fixed=20Makefile.am=20and=20ot?= =?utf8?q?hers=20in=20order=20to=20succeed=20compilation=20by=20TaoTao,=20?= =?utf8?q?thanks=20a=20lot!?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .gitignore | 9 ++++--- src/Makefile.am | 40 ++++++++++++++------------- src/main-gcu.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/main-x11.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main.c | 13 +++++++++ 5 files changed, 200 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 5fccd7f04..25dc413eb 100644 --- a/.gitignore +++ b/.gitignore @@ -12,12 +12,13 @@ autoconf.h.in config.log config.status Makefile -src/.deps -src/autoconf.h -src/stamp-h1 +src/**/.deps +src/**/.dirstamp +src/**/autoconf.h +src/**/stamp-h1 # generated by gcc -src/*.o +src/**/*.o src/hengband # Ignore generated documents by Doxygen diff --git a/src/Makefile.am b/src/Makefile.am index bc4cd66b3..5581c306f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am -- Process this file with automake to process Makefile.in -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign subdir-objects bin_PROGRAMS = hengband @@ -11,13 +11,7 @@ hengband_SOURCES = \ \ avatar.h avatar.c birth.c birth.h \ \ - bldg.c bldg.h chest.c chest.h chuukei.c \ - cmd-basic.c cmd-basic.h cmd-dump.c cmd-dump.h cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \ - cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \ - cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h cmd-gameoption.c cmd-gameoption.h\ - cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \ - cmd-usestaff.c cmd-usestaff.h cmd-zaprod.c cmd-zaprod.h cmd-zapwand.c \ - cmd-zapwand.h cmd-smith.c cmd-smith.h cmd-hissatsu.c cmd-hissatsu.h\ + bldg.c bldg.h chest.c chest.h chuukei.c chuukei.h \ \ core.c core.h files.c files.h \ \ @@ -37,7 +31,7 @@ hengband_SOURCES = \ load.c load.h \ dungeon-file.c dungeon-file.h \ main.c main-x11.c main-gcu.c \ - melee.h melee1.c mind.c mind.h \ + mind.c mind.h \ \ monster.h monsterrace.c monsterrace.h \ monsterrace-hook.c monsterrace-hook.h monster-process.c \ @@ -54,12 +48,10 @@ hengband_SOURCES = \ \ patron.h patron.c \ \ - projection.h projection.c \ - \ creature.h creature.c \ player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \ player-effects.c player-effects.h player-skill.c player-skill.h player-class.c player-class.h \ - player-race.c player-race.h player-pesonality.c player-pesonality.h player-sex.c player-sex.h \ + player-race.c player-race.h player-personality.c player-personality.h player-sex.c player-sex.h \ player-inventory.c player-inventory.h \ \ quest.h quest.c\ @@ -75,7 +67,7 @@ hengband_SOURCES = \ rooms.h rooms-normal.c rooms-normal.h rooms-pitnest.c rooms-pitnest.h \ rooms-special.c rooms-special.h rooms-trap.c rooms-trap.h rooms-vault.c \ rooms-vault.h save.c save.h scores.c scores.h selfinfo.c selfinfo.h \ - shoot.c shoot.h snipe.c snipe.h \ + snipe.c snipe.h \ \ rumor.h rumor.c \ \ @@ -89,23 +81,35 @@ hengband_SOURCES = \ spells-world.c spells-world.h \ \ sort.c sort.h \ - store.h store.c tables.c term.c term.h trap.c trap.h types.h util.c \ + store.h store.c term.c term.h trap.c trap.h util.c util.h \ wild.h wild.c wizard1.c wizard2.c \ warning.c warning.h world.c world.h \ \ - view-mainwindow.c view-mainwindow.h targeting.c \ + view-mainwindow.c view-mainwindow.h targeting.c targeting.h \ \ z-form.c z-form.h z-rand.c z-rand.h z-term.c z-term.h z-util.c z-util.h \ - z-virt.c z-virt.h + z-virt.c z-virt.h \ + \ + cmd/cmd-activate.c cmd/cmd-activate.h cmd/cmd-basic.c cmd/cmd-basic.h \ + cmd/cmd-dump.c cmd/cmd-dump.h cmd/cmd-eat.c cmd/cmd-eat.h \ + cmd/cmd-gameoption.c cmd/cmd-gameoption.h cmd/cmd-hissatsu.c cmd/cmd-hissatsu.h \ + cmd/cmd-item.c cmd/cmd-item.h cmd/cmd-magiceat.c cmd/cmd-magiceat.h \ + cmd/cmd-mane.c cmd/cmd-mane.h cmd/cmd-pet.c cmd/cmd-pet.h \ + cmd/cmd-quaff.c cmd/cmd-quaff.h cmd/cmd-read.c cmd/cmd-read.h \ + cmd/cmd-smith.c cmd/cmd-smith.h cmd/cmd-spell.c cmd/cmd-spell.h \ + cmd/cmd-usestaff.c cmd/cmd-usestaff.h cmd/cmd-zaprod.c cmd/cmd-zaprod.h \ + cmd/cmd-zapwand.c cmd/cmd-zapwand.h \ + \ + combat/melee.h combat/melee1.c combat/shoot.c combat/shoot.h EXTRA_hengband_SOURCES = \ angband.ico angband.rc ang_eng.rc maid-x11.c main-mac.c main-win.c \ main-dos.c main-ibm.c \ makefile.bcc makefile.std makefile.dos makefile.ibm \ - readdib.c wall.bmp + readdib.c readdib.h wall.bmp COMPILE = ./gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -Icmd -Icombat install-exec-hook: if SET_GID diff --git a/src/main-gcu.c b/src/main-gcu.c index 541c624ba..bab7cf2ab 100644 --- a/src/main-gcu.c +++ b/src/main-gcu.c @@ -157,6 +157,8 @@ */ #include "angband.h" +#include "files.h" +#include "term.h" #ifdef USE_GCU @@ -284,6 +286,80 @@ static term_data data[MAX_TERM_DATA]; #ifdef USE_SOUND + /* + * Standard sound names + */ +static const concptr angband_sound_name[SOUND_MAX] = +{ + "dummy", + "hit", + "miss", + "flee", + "drop", + "kill", + "level", + "death", + "study", + "teleport", + "shoot", + "quaff", + "zap", + "walk", + "tpother", + "hitwall", + "eat", + "store1", + "store2", + "store3", + "store4", + "dig", + "opendoor", + "shutdoor", + "tplevel", + "scroll", + "buy", + "sell", + "warn", + "rocket", + "n_kill", + "u_kill", + "quest", + "heal", + "x_heal", + "bite", + "claw", + "m_spell", + "summon", + "breath", + "ball", + "m_heal", + "atkspell", + "evil", + "touch", + "sting", + "crush", + "slime", + "wail", + "winner", + "fire", + "acid", + "elec", + "cold", + "illegal", + "fail", + "wakeup", + "invuln", + "fall", + "pain", + "destitem", + "moan", + "show", + "unused", + "explode", + "glass", + "reflect", +}; + static concptr ANGBAND_DIR_XTRA_SOUND; /* diff --git a/src/main-x11.c b/src/main-x11.c index 15d8db31c..cae1ad4ba 100644 --- a/src/main-x11.c +++ b/src/main-x11.c @@ -107,8 +107,18 @@ #include "angband.h" +#include "core.h" +#include "files.h" +#include "term.h" +/* + * Available graphic modes + */ +#define GRAPHICS_NONE 0 +#define GRAPHICS_ORIGINAL 1 +#define GRAPHICS_ADAM_BOLT 2 +#define GRAPHICS_HENGBAND 3 #ifdef USE_X11 @@ -2827,6 +2837,80 @@ static errr CheckEvent(bool wait) #ifdef USE_SOUND + /* + * Standard sound names + */ +static const concptr angband_sound_name[SOUND_MAX] = +{ + "dummy", + "hit", + "miss", + "flee", + "drop", + "kill", + "level", + "death", + "study", + "teleport", + "shoot", + "quaff", + "zap", + "walk", + "tpother", + "hitwall", + "eat", + "store1", + "store2", + "store3", + "store4", + "dig", + "opendoor", + "shutdoor", + "tplevel", + "scroll", + "buy", + "sell", + "warn", + "rocket", + "n_kill", + "u_kill", + "quest", + "heal", + "x_heal", + "bite", + "claw", + "m_spell", + "summon", + "breath", + "ball", + "m_heal", + "atkspell", + "evil", + "touch", + "sting", + "crush", + "slime", + "wail", + "winner", + "fire", + "acid", + "elec", + "cold", + "illegal", + "fail", + "wakeup", + "invuln", + "fall", + "pain", + "destitem", + "moan", + "show", + "unused", + "explode", + "glass", + "reflect", +}; + /* * An array of sound file names */ diff --git a/src/main.c b/src/main.c index 8dc9755e7..57de56cb0 100644 --- a/src/main.c +++ b/src/main.c @@ -9,7 +9,20 @@ */ #include "angband.h" +#include "core.h" +#include "files.h" +#include "inet.h" +#include "init.h" +#include "scores.h" +#include "term.h" +/* + * Available graphic modes + */ +#define GRAPHICS_NONE 0 +#define GRAPHICS_ORIGINAL 1 +#define GRAPHICS_ADAM_BOLT 2 +#define GRAPHICS_HENGBAND 3 /* * Some machines have a "main()" function in their "main-xxx.c" file, -- 2.11.0