diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-05 19:58:50 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-05 19:58:50 +1000 |
| commit | b9def0122143459c4d1fd0721384028f3974dc69 (patch) | |
| tree | f7b26f422d93b6f6769a45cb757c9075279a7c6a /crawl-ref/source/player.h | |
| parent | 313465bf23382559f7c26c63849b64266c8d939f (diff) | |
| download | crawl-ref-b9def0122143459c4d1fd0721384028f3974dc69.tar.gz crawl-ref-b9def0122143459c4d1fd0721384028f3974dc69.zip | |
Move *_res(ist)_magic to relevant classes, provide actor interface.
Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
Diffstat (limited to 'crawl-ref/source/player.h')
| -rw-r--r-- | crawl-ref/source/player.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index f11168d436..fe8940f033 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -424,6 +424,8 @@ public: int res_holy_energy(const actor *) const; int res_negative_energy() const; int res_torment() const; + int res_magic() const; + bool check_res_magic(int power); bool confusable() const; bool slowable() const; @@ -547,8 +549,6 @@ int player_wielded_item(); bool extrinsic_amulet_effect(jewellery_type amulet); bool wearing_amulet(jewellery_type which_am, bool calc_unid = true); -bool you_resist_magic(int power); - int burden_change(void); int carrying_capacity(burden_state_type bs = BS_OVERLOADED); @@ -610,8 +610,6 @@ int player_res_rotting(); bool player_control_teleport(bool calc_unid = true, bool temp = true, bool items = true); -int player_res_magic(void); - int player_res_asphyx(); int player_shield_class(void); |