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.
| Revision | 3a79de09806a0e6ffd499d6b44a99721375664a8 (tree) |
|---|---|
| Time | 2021-01-14 06:46:54 |
| Author | Eric Branlund <ebranlund@fast...> |
| Commiter | Eric Branlund |
Merge branch 'release/3.0.0Alpha' into release/3.0.0Alpha-Cocoa
src/action/action-limited.c (diff) src/io/input-key-processor.c (diff)| @@ -26,7 +26,7 @@ bool cmd_limit_cast(player_type *creature_ptr) | ||
| 26 | 26 | return TRUE; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - if (is_shero(creature_ptr)) { | |
| 29 | + if (is_shero(creature_ptr) && (creature_ptr->pclass != CLASS_BERSERKER)) { | |
| 30 | 30 | msg_format(_("狂戦士化していて頭が回らない！", "You cannot think directly!")); |
| 31 | 31 | return TRUE; |
| 32 | 32 | } |
| @@ -392,7 +392,7 @@ void process_command(player_type *creature_ptr) | ||
| 392 | 392 | |
| 393 | 393 | msg_format(_("反魔法バリアが%sを邪魔した！", "An anti-magic shell disrupts your %s!"), which_power); |
| 394 | 394 | free_turn(creature_ptr); |
| 395 | - } else if (is_shero(creature_ptr)) { | |
| 395 | + } else if (is_shero(creature_ptr) && (creature_ptr->pclass != CLASS_BERSERKER)) { | |
| 396 | 396 | msg_format(_("狂戦士化していて頭が回らない！", "You cannot think directly!")); |
| 397 | 397 | free_turn(creature_ptr); |
| 398 | 398 | } else { |
Fork