diff options
| author | elliptic <hyperelliptical@gmail.com> | 2011-12-29 11:32:15 -0500 |
|---|---|---|
| committer | elliptic <hyperelliptical@gmail.com> | 2011-12-29 11:32:15 -0500 |
| commit | eb143a196a78c7e8e885add7267b9ccfc235267d (patch) | |
| tree | 459af3ac711dcad6a2e14d44799561004cd3be20 /crawl-ref/source/melee_attack.h | |
| parent | e510d2bcd3b690af1597e1e7d84199018fd9c498 (diff) | |
| download | crawl-ref-eb143a196a78c7e8e885add7267b9ccfc235267d.tar.gz crawl-ref-eb143a196a78c7e8e885add7267b9ccfc235267d.zip | |
Rename "baseattack" to "uc_attack", fix a couple comments.
The old terminology was misleading, since this is just the unarmed aux given
by UC skill.
Diffstat (limited to 'crawl-ref/source/melee_attack.h')
| -rw-r--r-- | crawl-ref/source/melee_attack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h index 8b3ad1a3e8..acf55c36bc 100644 --- a/crawl-ref/source/melee_attack.h +++ b/crawl-ref/source/melee_attack.h @@ -142,7 +142,7 @@ private: // Player-attack specific stuff // Auxiliary unarmed attacks. bool player_aux_unarmed(); - unarmed_attack_type player_aux_choose_baseattack(); + unarmed_attack_type player_aux_choose_uc_attack(); void player_aux_setup(unarmed_attack_type atk); bool player_aux_test_hit(); bool player_aux_apply(unarmed_attack_type atk); @@ -176,7 +176,7 @@ private: // Added in, were previously static methods of fight.cc bool _tran_forbid_aux_attack(unarmed_attack_type atk); - bool _extra_aux_attack(unarmed_attack_type atk, bool is_base); + bool _extra_aux_attack(unarmed_attack_type atk, bool is_uc); int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK, bool vampiric = false); bool _player_vampire_draws_blood(const monster* mon, const int damage, |