summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-03 22:59:32 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-03 22:59:32 +0000
commit5381635abae0b75987bce01bb596b35fc11bb529 (patch)
treeb80128f4c1d8259f40fd9402d564031226ace5bc /crawl-ref/source/beam.cc
parentc067a7b8496eedb4b1b06f16bfc70c333a9a823a (diff)
downloadcrawl-ref-5381635abae0b75987bce01bb596b35fc11bb529.tar.gz
crawl-ref-5381635abae0b75987bce01bb596b35fc11bb529.zip
[1747353] Allies shouldn't be noted as "defeated" by you.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1739 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index b2d69ba53a..bb28e53645 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4464,7 +4464,7 @@ bolt::bolt() : range(0), rangeMax(0), type(SYM_ZAP), colour(BLACK),
chose_ray(false)
{ }
-int bolt::killer() const
+killer_type bolt::killer() const
{
if (flavour == BEAM_BANISH)
return (KILL_RESET);