diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2010-04-14 15:43:09 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2010-04-14 15:44:03 +0200 |
| commit | c692b386ced5c1f0614ace4c22a449c3737906df (patch) | |
| tree | 657f8d1f767437356a855bfe9114c3270503a6f4 /crawl-ref/source/fight.h | |
| parent | 25ba707d26259f7a35da9367a31df9184fd89b60 (diff) | |
| download | crawl-ref-c692b386ced5c1f0614ace4c22a449c3737906df.tar.gz crawl-ref-c692b386ced5c1f0614ace4c22a449c3737906df.zip | |
Revert weapon delay calculation changes.
The delay formulas are too complicated to analyze. It turns
out that not only is attack delay randomized in
melee_attack::player_apply_attack_delay, but even base
weapon delay in melee_attack::player_weapon_speed goes
through randomization.
This reverts commit 25ba707d26259f7a35da9367a31df9184fd89b60.
This reverts commit 59cb47231f09c696c38ef72956e962c5b9cea191.
This reverts commit cea96c26d7185e3e46af5ff9497a6a240bd1a2a0.
This reverts commit e2c10d8fc5747b45025b8a48d6c3aa7b9300d6d3.
This reverts commit 43f9de964ec341f165fe942904758e08d56364d8.
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 06d7f89684..516b4565d7 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -9,7 +9,6 @@ #define FIGHT_H #include "mon-enum.h" -#include "random-enum.h" enum unarmed_attack_type { @@ -64,9 +63,6 @@ bool monsters_fight(monsters* attacker, monsters* attacked, bool wielded_weapon_check(item_def *weapon, bool no_message = false); int calc_your_to_hit(bool random_factor); int calc_heavy_armour_penalty(bool random_factor); -int calc_your_attack_delay(random_type rand, - int scale = 1, - const item_def* weapon = NULL); unchivalric_attack_type is_unchivalric_attack(const actor *attacker, const actor *defender); |