• R/O
  • HTTP
  • SSH
  • HTTPS

hengbandosx: Commit

The master and develop branches track hengband.

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


Commit MetaInfo

Revision3a79de09806a0e6ffd499d6b44a99721375664a8 (tree)
Time2021-01-14 06:46:54
AuthorEric Branlund <ebranlund@fast...>
CommiterEric Branlund

Log Message

Merge branch 'release/3.0.0Alpha' into release/3.0.0Alpha-Cocoa

Change Summary

Incremental Difference

--- a/src/action/action-limited.c
+++ b/src/action/action-limited.c
@@ -26,7 +26,7 @@ bool cmd_limit_cast(player_type *creature_ptr)
2626 return TRUE;
2727 }
2828
29- if (is_shero(creature_ptr)) {
29+ if (is_shero(creature_ptr) && (creature_ptr->pclass != CLASS_BERSERKER)) {
3030 msg_format(_("狂戦士化していて頭が回らない!", "You cannot think directly!"));
3131 return TRUE;
3232 }
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -392,7 +392,7 @@ void process_command(player_type *creature_ptr)
392392
393393 msg_format(_("反魔法バリアが%sを邪魔した!", "An anti-magic shell disrupts your %s!"), which_power);
394394 free_turn(creature_ptr);
395- } else if (is_shero(creature_ptr)) {
395+ } else if (is_shero(creature_ptr) && (creature_ptr->pclass != CLASS_BERSERKER)) {
396396 msg_format(_("狂戦士化していて頭が回らない!", "You cannot think directly!"));
397397 free_turn(creature_ptr);
398398 } else {
Show on old repository browser