summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-15 15:26:57 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-15 15:26:57 +0000
commitcc137f4b229d1763c3ad71fe56605b8611a1067c (patch)
tree601f5b148db6c1d94d593d89a11208ae3fa925ad /crawl-ref/source/player.cc
parent8b6107e382417e437cc541dfad85c20234ca3d7c (diff)
downloadcrawl-ref-cc137f4b229d1763c3ad71fe56605b8611a1067c.tar.gz
crawl-ref-cc137f4b229d1763c3ad71fe56605b8611a1067c.zip
Another code cleanup.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4244 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index cfcd8087a1..c0241995eb 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1454,10 +1454,11 @@ bool player_res_asphyx()
return (false);
}
-bool player_control_teleport(bool calc_unid) {
- return ( you.duration[DUR_CONTROL_TELEPORT] ||
- player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid) ||
- you.mutation[MUT_TELEPORT_CONTROL] );
+bool player_control_teleport(bool calc_unid)
+{
+ return ( you.duration[DUR_CONTROL_TELEPORT]
+ || player_equip(EQ_RINGS, RING_TELEPORT_CONTROL, calc_unid)
+ || you.mutation[MUT_TELEPORT_CONTROL] );
}
int player_res_torment(bool)
@@ -2738,7 +2739,8 @@ int burden_change(void)
{
you.burden_state = BS_ENCUMBERED;
- if (old_burdenstate != you.burden_state) {
+ if (old_burdenstate != you.burden_state)
+ {
mpr("You are being weighed down by all of your possessions.");
learned_something_new(TUT_HEAVY_LOAD);
}