• R/O
  • HTTP
  • SSH
  • HTTPS

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.


Commit MetaInfo

Revisão71c87790290d1f9ddbf8d84d50e6d23d9cdd38ea (tree)
Hora2022-05-16 05:25:08
AutorEric Branlund <ebranlund@fast...>
CommiterEric Branlund

Mensagem de Log

Merge branch 'develop' into macos-develop

Mudança Sumário

Diff

--- a/.github/workflows/build-with-autotools.yml
+++ b/.github/workflows/build-with-autotools.yml
@@ -18,7 +18,7 @@ on:
1818
1919 jobs:
2020 build:
21- runs-on: ubuntu-latest
21+ runs-on: ubuntu-20.04
2222 steps:
2323 - uses: actions/checkout@v2
2424
@@ -35,6 +35,7 @@ jobs:
3535
3636 - name: Install required packages
3737 run: |
38+ sudo apt-get update
3839 sudo apt-get install \
3940 autoconf-archive \
4041 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
2626 void HaftedEnchanter::apply_magic()
2727 {
2828 this->decide_skip();
29+ this->give_killing_bonus();
2930 MeleeWeaponEnchanter::apply_magic();
3031 }
3132
--- 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
2525 void PolearmEnchanter::apply_magic()
2626 {
2727 this->decide_skip();
28+ this->give_killing_bonus();
2829 MeleeWeaponEnchanter::apply_magic();
2930 }
3031
--- 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)
378378 prt("rtsxnaeydcedwlatdcedsrekdfddrxss", ++line, j);
379379 prt_binary(get_seq_32bits(flgs, 32 * 1), ++line, j);
380380
381- line = 10;
381+ line = 13;
382382 prt("+------------FLAGS3------------+", line, j + 32);
383383 prt("fe cnn t stdrmsiiii d ab ", ++line, j + 32);
384384 prt("aa aoomywhs lleeieihgggg rtgl ", ++line, j + 32);
Show on old repository browser