OSDN > Pesquisar Software > Games/Entertainment > hengbandforosx > SCM > git > hengbandosx > Commit

hengbandforosx
Fork
hengbandosx
web

hengbandosx: Commit

The master and develop branches track hengband.

OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.

Revisão	71c87790290d1f9ddbf8d84d50e6d23d9cdd38ea (tree)
Hora	2022-05-16 05:25:08
Autor	Eric Branlund <ebranlund@fast...>
Commiter	Eric Branlund

Merge branch 'develop' into macos-develop

--- a/.github/workflows/build-with-autotools.yml

+++ b/.github/workflows/build-with-autotools.yml

		@@ -35,6 +35,7 @@ jobs:
35	35
36	36	- name: Install required packages
37	37	run: \|
	38	+ sudo apt-get update
38	39	sudo apt-get install \
39	40	autoconf-archive \
40	41	libncursesw5-dev \

--- a/src/object-enchant/weapon/apply-magic-hafted.cpp

+++ b/src/object-enchant/weapon/apply-magic-hafted.cpp

		@@ -26,6 +26,7 @@ HaftedEnchanter::HaftedEnchanter(PlayerType player_ptr, ObjectType o_ptr, DEPT
26	26	void HaftedEnchanter::apply_magic()
27	27	{
28	28	this->decide_skip();
	29	+ this->give_killing_bonus();
29	30	MeleeWeaponEnchanter::apply_magic();
30	31	}
31	32

--- a/src/object-enchant/weapon/apply-magic-polearm.cpp

+++ b/src/object-enchant/weapon/apply-magic-polearm.cpp

		@@ -25,6 +25,7 @@ PolearmEnchanter::PolearmEnchanter(PlayerType player_ptr, ObjectType o_ptr, DE
25	25	void PolearmEnchanter::apply_magic()
26	26	{
27	27	this->decide_skip();
	28	+ this->give_killing_bonus();
28	29	MeleeWeaponEnchanter::apply_magic();
29	30	}
30	31

--- a/src/wizard/wizard-item-modifier.cpp

+++ b/src/wizard/wizard-item-modifier.cpp

		@@ -378,7 +378,7 @@ static void wiz_display_item(PlayerType player_ptr, ObjectType o_ptr)
378	378	prt("rtsxnaeydcedwlatdcedsrekdfddrxss", ++line, j);
379	379	prt_binary(get_seq_32bits(flgs, 32 * 1), ++line, j);
380	380
381		- line = 10;
	381	+ line = 13;
382	382	prt("+------------FLAGS3------------+", line, j + 32);
383	383	prt("fe cnn t stdrmsiiii d ab ", ++line, j + 32);
384	384	prt("aa aoomywhs lleeieihgggg rtgl ", ++line, j + 32);