Commit: ac1c992fe7472185e181020dafbaf7e19fddb8a9 - hengband (git)

変愚蛮怒のメインリポジトリです

Commit MetaInfo

• Revision: ac1c992fe7472185e181020dafbaf7e19fddb8a9 (tree)
• Time: 2020-02-08 00:30:56
• Author: deskull <deskull@user...>
• Commiter: deskull

Log Message

Merge pull request #40005 (phonohawk/hengband/fix-build-unix into master).

Change Summary

• modified: .gitignore
• modified: src/Makefile.am
• modified: src/monster1.c

Incremental Difference

--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # generated files by autoconf and automake
 aclocal.m4
 autom4te.cache
+compile
 configure
 depcomp
 install-sh

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,7 @@ hengband_SOURCES = \
 	\
 	rumor.h rumor.c \
 	\
-	spells.h
+	spells.h \
 	spells1.c spells2.c spells3.c \
 	spells-diceroll.c spells-diceroll.h \
 	spells-floor.c spells-floor.h \
@@ -79,7 +79,7 @@ hengband_SOURCES = \
 	spells-world.c spells-world.h \
 	\
 	sort.c sort.h \
-	store.h store.c tables.c trap.c trap.h types.h util.c \
+	store.h store.c tables.c term.c term.h trap.c trap.h types.h util.c \
 	variable.c wild.h wild.c wizard1.c wizard2.c \
 	warning.c warning.h world.c world.h \
 	\

--- a/src/monster1.c
+++ b/src/monster1.c
@@ -669,7 +669,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 			/* Mention the experience */
 			hooked_roff(format(" is worth about %ld.%02ld point%s for level %d player",
 				(long)i, (long)j,
-				(((i == 1) && (j == 0)) ? "" : "s")), p_ptr->lev);
+				(((i == 1) && (j == 0)) ? "" : "s"), p_ptr->lev));
 
 			/* Take account of annoying English */
 			p = "th";