summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-07 21:37:34 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-07 21:37:34 +0000
commit100d0a3c9501882904c8d467bdd91bd43bec2d4f (patch)
tree803f3a4b714692635d7c52d5aa8be36df8d5c739 /crawl-ref/source/player.cc
parentf2bd755240e9711cfb0d8c8b69f1bad7185637a3 (diff)
downloadcrawl-ref-100d0a3c9501882904c8d467bdd91bd43bec2d4f.tar.gz
crawl-ref-100d0a3c9501882904c8d467bdd91bd43bec2d4f.zip
Add more minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7408 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 9cf81785db..8e8f8e8ae7 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1284,22 +1284,6 @@ int player_res_fire(bool calc_unid, bool temp, bool items)
return (rf);
}
-int player_res_sticky_flame(bool calc_unid, bool temp, bool items)
-{
- int res = 0;
-
- if (you.species == SP_MOTTLED_DRACONIAN && you.experience_level > 5)
- res++;
-
- if (items && player_equip(EQ_BODY_ARMOUR, ARM_MOTTLED_DRAGON_ARMOUR))
- res++;
-
- if (res > 1)
- res = 1;
-
- return (res);
-}
-
int player_res_steam(bool calc_unid, bool temp, bool items)
{
int res = 0;
@@ -1574,6 +1558,22 @@ int player_res_poison(bool calc_unid, bool temp, bool items)
return (rp);
}
+int player_res_sticky_flame(bool calc_unid, bool temp, bool items)
+{
+ int rsf = 0;
+
+ if (you.species == SP_MOTTLED_DRACONIAN && you.experience_level > 5)
+ rsf++;
+
+ if (items && player_equip(EQ_BODY_ARMOUR, ARM_MOTTLED_DRAGON_ARMOUR))
+ rsf++;
+
+ if (rsf > 1)
+ rsf = 1;
+
+ return (rsf);
+}
+
int player_spec_death()
{
int sd = 0;