diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
commit | cc857c940cfe1bfe8d78674dbce53e5b71acaf41 (patch) | |
tree | d1e62b5c66b9bd3d0f8cf1873b8dd858060816c5 /src/cmd1.cc | |
parent | 5a3f511fd036dd73152786e83f32c32f274f2398 (diff) |
Move ability_type::acquired to p_ptr struct
This is justified by the fact that the 'acquired' flag is actually a
player-centered bit of information and must be
loaded/saved. Everything else in ability_type is defined by the *.txt
files.
Diffstat (limited to 'src/cmd1.cc')
-rw-r--r-- | src/cmd1.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc index c54e3dbd..f8e064c2 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -2369,7 +2369,7 @@ void py_attack(int y, int x, int max_blow) /* Hack -- High-level warriors can spread their attacks out * among weaker foes. */ - if ((has_ability(AB_SPREAD_BLOWS)) && (num < num_blow) && + if ((p_ptr->has_ability(AB_SPREAD_BLOWS)) && (num < num_blow) && (energy_use)) { energy_use = energy_use * num / num_blow; @@ -2587,7 +2587,7 @@ bool_ player_can_enter(byte feature) { if (p_ptr->fly || pass_wall || - (has_ability(AB_TREE_WALK)) || + p_ptr->has_ability(AB_TREE_WALK) || (p_ptr->mimic_form == resolve_mimic_name("Ent")) || ((p_ptr->grace >= 9000) && praying_to(GOD_YAVANNA))) return (TRUE); |