• R/O
  • HTTP
  • SSH
  • HTTPS

hengbandosx: 提交

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

修订版1888e527a08d341350513bc805e81e31b0b5e2db (tree)
时间2022-09-06 04:18:42
作者Eric Branlund <ebranlund@fast...>
CommiterEric Branlund

Log Message

Merge branch 'develop' into macos-develop

更改概述

差异

--- a/.github/scripts/check-format.sh
+++ b/.github/scripts/check-format.sh
@@ -8,12 +8,12 @@ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key
88 cat <<EOF | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null
99 deb http://apt.llvm.org/focal/ llvm-toolchain-focal main
1010 deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal main
11-# 13
12-deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main
13-deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main
1411 # 14
1512 deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main
1613 deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main
14+# 15
15+deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main
16+deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main
1717
1818 EOF
1919
@@ -23,6 +23,12 @@ sudo apt-get install clang-format-15 >/dev/null
2323 SRC_FILES=$(find src/ -name \*.cpp -or -name \*.h)
2424
2525 clang-format-15 -style=file:.github/scripts/check-clang-format-style -i $SRC_FILES
26+clang_format_result=$?
27+
28+if [ $clang_format_result -ne 0 ]; then
29+ echo "Could not execute clang-format properly."
30+ exit $clang_format_result
31+fi
2632
2733 DIFF_FILE=$(mktemp)
2834 git diff >$DIFF_FILE
--- a/lib/file/rumors.txt
+++ b/lib/file/rumors.txt
@@ -388,7 +388,7 @@ Strength is crucial. Isn't witchcraft just an embroidery in a bard's tale?
388388 Whenever doubled over force yourself upright. Who wants a bad loser?
389389 Give heartened chase when your enemies turned tail. Last bit by missile!
390390 Vlad Dracula? Die and forget, since death is forbidden - to him, not you!
391-Vlad Dracula? He hungers after you and thirstes for you!
391+Vlad Dracula? He hungers after you and thirsts for you!
392392 Luck and twice luck to meet a hydra if fearless and breath-shielded you are.
393393 All your misdeeds are engraved into the very flesh-score of time itself.
394394 Such a chaos spawn will disenchant your best gear in no time at all.
@@ -456,7 +456,7 @@ GHOST said: "I would not wish to add to your probable present paranoia."
456456 One of life's smaller puzzles is how to get control of the nearer futures.
457457 The King in Yellow is strong in help. But he is also quite jumpy by himself.
458458 Glaurung and all his kinsfolk - send them where the pepper grows! It's timing.
459-The swamps south of the Elventown is worthy of some hunting excursions!
459+The swamps south of the Elventown are worthy of some hunting excursions!
460460 You would be amazed of what a Greater Kraken is able to give to you.
461461 In deep waters any treasures will be lost! Lure them coastwards.
462462 Any means of digging are crucial for designing the battleground as You like!
@@ -499,7 +499,7 @@ Prices? If you insist on haggling you'll never advance seriously!
499499 Haggling is the only way to get the best prices.
500500 Well, I tell ya, the dungeons landlords are mulling this over gloomily!
501501 Don't you think you are on a descending curve, young firehead?
502-You are starting to loose your temper? So what? Gnaw your pistachios!
502+You are starting to lose your temper? So what? Gnaw your pistachios!
503503 It shrieks? Don't bother! Presumably there will be just innocent bystanders.
504504 Still you might still fade out again! Been seeing so many ghostly apparitions.
505505 Even if the bluff fails them never give up! The caves are hotbed of banditry.
--- a/lib/file/rumors_j.txt
+++ b/lib/file/rumors_j.txt
@@ -859,7 +859,7 @@ Oremor nhoj いならなばねさ倒を私はにつ勝でムーゲのこ。
859859 敵がしっぽ巻いて逃げ出したら、穏便に追いかけましょう。最後の少しは遠隔攻撃で!
860860 #Vlad Dracula? Die and forget, since death is forbidden - to him, not you!
861861 吸血鬼『ヴラド』?やめとけ、やめとけ、アイツは死を禁じられているからな!
862-#Vlad Dracula? He hungers after you and thirstes for you!
862+#Vlad Dracula? He hungers after you and thirsts for you!
863863 吸血鬼『ヴラド』?飢えるほどお前の血を欲しているらしいぞ!
864864 #Luck and twice luck to meet a hydra if fearless and breath-shielded you are.
865865 恐れ知らずでブレスに耐性があれば、ヒドラに遭うのは倍ラッキーだ。
@@ -991,7 +991,7 @@ Oremor nhoj いならなばねさ倒を私はにつ勝でムーゲのこ。
991991 『黄衣の王』は助けに強いが、一人でビビってることもある。
992992 #Glaurung and all his kinsfolk - send them where the pepper grows! It's timing.
993993 今こそ、『グラウルング』とその仲間たちを、胡椒の育つ場所に送り込んでください!
994-#The swamps south of the Elventown is worthy of some hunting excursions!
994+#The swamps south of the Elventown are worthy of some hunting excursions!
995995 エルフの街の南の湿地帯は狩りの遠足の足音で騒がしい!
996996 #You would be amazed of what a Greater Kraken is able to give to you.
997997 あなたはグレータークラーケンがあなたに対して出来る事をを知ったら驚くでしょう。
@@ -1073,7 +1073,7 @@ Oremor nhoj いならなばねさ倒を私はにつ勝でムーゲのこ。
10731073 えー、聞いたところによると、ダンジョンの主はこのことを悲観的であると考えています。
10741074 #Don't you think you are on a descending curve, young firehead?
10751075 若い人よ、あんたは下り坂を下ってるとは思わんかね?
1076-#You are starting to loose your temper? So what? Gnaw your pistachios!
1076+#You are starting to lose your temper? So what? Gnaw your pistachios!
10771077 意欲がなくなってきてないか?だったら、ピスタチオを食え!
10781078 #It shrieks? Don't bother! Presumably there will be just innocent bystanders.
10791079 悲鳴?気にしないください。きっと無関心な傍観者がいてくださいます。
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -52,8 +52,8 @@
5252 #include "target/target-types.h"
5353 #include "term/screen-processor.h"
5454 #include "timed-effect/player-acceleration.h"
55-#include "timed-effect/player-deceleration.h"
5655 #include "timed-effect/player-confusion.h"
56+#include "timed-effect/player-deceleration.h"
5757 #include "timed-effect/timed-effects.h"
5858 #include "view/display-messages.h"
5959
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -416,7 +416,7 @@ int take_hit(PlayerType *player_ptr, int damage_type, int damage, concptr hit_fr
416416 auto is_hallucinated = effects->hallucination()->is_hallucinated();
417417 auto paralysis_state = "";
418418 if (effects->paralysis()->is_paralyzed()) {
419- paralysis_state = player_ptr->free_act ? _("彫像状態で", " while being the statue") : _("麻痺状態で", " while paralyzing");
419+ paralysis_state = player_ptr->free_act ? _("彫像状態で", " while being the statue") : _("麻痺状態で", " while paralyzed");
420420 }
421421
422422 auto hallucintion_state = is_hallucinated ? _("幻覚に歪んだ", "hallucinatingly distorted ") : "";
--- a/src/status/bad-status-setter.cpp
+++ b/src/status/bad-status-setter.cpp
@@ -398,7 +398,7 @@ bool BadStatusSetter::set_deceleration(const TIME_EFFECT tmp_v, bool do_dec)
398398 if (this->player_ptr->is_dead) {
399399 return false;
400400 }
401-
401+
402402 auto deceleration = this->player_ptr->effects()->deceleration();
403403 auto is_slow = deceleration->is_slow();
404404 if (v > 0) {
Show on old repository browser