diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2010-05-06 09:22:00 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2010-05-06 09:35:35 +0200 |
| commit | 28b86617f414fb6cc0e0b933bc793b0209720a64 (patch) | |
| tree | 8d9bb50d0f027a1bbd70aa85c25194172f4920d3 /crawl-ref/source/fight.h | |
| parent | a884d546f45b5d56b747d8c08bc7b4e3870263f1 (diff) | |
| download | crawl-ref-28b86617f414fb6cc0e0b933bc793b0209720a64.tar.gz crawl-ref-28b86617f414fb6cc0e0b933bc793b0209720a64.zip | |
Roll back player_aux_unarmed rewrite.
As discussed privately. A new rewrite will come.
This reverts commit 607bea974114ffd0be153a0af52302bbb04038df.
This reverts commit 58b8890cabd409396c4eb1972fd0249d8971c5d7.
This reverts commit f8e18373932f005fecaadaab00c341f6b6958183.
This reverts commit 870de8f6f67f7b462f1eb17a5f53cb34535f4a60.
This reverts commit 279291369dd4dea4e7c1454fc00b29a7f088fab2.
This reverts part of commit 5a59108b0370ed3aa353192bbec306f7249258b1,
namely the player_aux_unarmed part.
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 43980d07a2..301d23e0c1 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -14,27 +14,13 @@ enum unarmed_attack_type { UNAT_NO_ATTACK, // 0 - UNAT_PUNCH, UNAT_KICK, UNAT_HEADBUTT, UNAT_TAILSLAP, + UNAT_PUNCH, UNAT_BITE, - UNAT_FIRST = UNAT_PUNCH, - UNAT_LAST = UNAT_BITE -}; - -struct unarmed_attack_data -{ - unarmed_attack_type uattack; - int damage_brand; - int base_damage; - int bonus_damage; - int noise_factor; - std::string attack_verb; - std::string miss_verb; - bool simple_miss_message; - bool uc_conditions; - bool uc_special_conditions; + UNAT_FIRST_ATTACK = UNAT_KICK, + UNAT_LAST_ATTACK = UNAT_BITE }; enum unchivalric_attack_type |