• R/O
  • HTTP
  • SSH
  • HTTPS

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

修訂ac1c992fe7472185e181020dafbaf7e19fddb8a9 (tree)
時間2020-02-08 00:30:56
作者deskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

差異

--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
11 # generated files by autoconf and automake
22 aclocal.m4
33 autom4te.cache
4+compile
45 configure
56 depcomp
67 install-sh
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,7 @@ hengband_SOURCES = \
6969 \
7070 rumor.h rumor.c \
7171 \
72- spells.h
72+ spells.h \
7373 spells1.c spells2.c spells3.c \
7474 spells-diceroll.c spells-diceroll.h \
7575 spells-floor.c spells-floor.h \
@@ -79,7 +79,7 @@ hengband_SOURCES = \
7979 spells-world.c spells-world.h \
8080 \
8181 sort.c sort.h \
82- store.h store.c tables.c trap.c trap.h types.h util.c \
82+ store.h store.c tables.c term.c term.h trap.c trap.h types.h util.c \
8383 variable.c wild.h wild.c wizard1.c wizard2.c \
8484 warning.c warning.h world.c world.h \
8585 \
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -669,7 +669,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
669669 /* Mention the experience */
670670 hooked_roff(format(" is worth about %ld.%02ld point%s for level %d player",
671671 (long)i, (long)j,
672- (((i == 1) && (j == 0)) ? "" : "s")), p_ptr->lev);
672+ (((i == 1) && (j == 0)) ? "" : "s"), p_ptr->lev));
673673
674674 /* Take account of annoying English */
675675 p = "th";