summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/player.h')
-rw-r--r--crawl-ref/source/player.h6
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);