summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fineff.cc
diff options
context:
space:
mode:
authorDracoOmega <draco_omega@live.com>2013-02-19 17:15:16 -0330
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2013-02-21 03:08:48 -0600
commit4975cdf967574de934774f0f0cb52fc60a76aba4 (patch)
treef30f9fe0cbcf8e278881aed47d312a3bad8fd98a /crawl-ref/source/fineff.cc
parentf7b5349e03d234b46ccb4924c586ab3015ae9d14 (diff)
downloadcrawl-ref-4975cdf967574de934774f0f0cb52fc60a76aba4.tar.gz
crawl-ref-4975cdf967574de934774f0f0cb52fc60a76aba4.zip
Rename kraken_damage_fineff to deferred_damage_fineff
There was nothing specific to kraken in the code, and there are other cases where this fineffect might be useful.
Diffstat (limited to 'crawl-ref/source/fineff.cc')
-rw-r--r--crawl-ref/source/fineff.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc
index 22ace09c1d..b7355270b8 100644
--- a/crawl-ref/source/fineff.cc
+++ b/crawl-ref/source/fineff.cc
@@ -79,9 +79,9 @@ bool blood_fineff::mergeable(const final_effect &fe) const
return o && posn == o->posn && mtype == o->mtype;
}
-bool kraken_damage_fineff::mergeable(const final_effect &fe) const
+bool deferred_damage_fineff::mergeable(const final_effect &fe) const
{
- const kraken_damage_fineff *o = dynamic_cast<const kraken_damage_fineff *>(&fe);
+ const deferred_damage_fineff *o = dynamic_cast<const deferred_damage_fineff *>(&fe);
return o && att == o->att && def == o->def;
}
@@ -114,12 +114,12 @@ void blood_fineff::merge(const final_effect &fe)
blood += bfe->blood;
}
-void kraken_damage_fineff::merge(const final_effect &fe)
+void deferred_damage_fineff::merge(const final_effect &fe)
{
- const kraken_damage_fineff *krakfe =
- dynamic_cast<const kraken_damage_fineff *>(&fe);
- ASSERT(krakfe && mergeable(*krakfe));
- damage += krakfe->damage;
+ const deferred_damage_fineff *ddamfe =
+ dynamic_cast<const deferred_damage_fineff *>(&fe);
+ ASSERT(ddamfe && mergeable(*ddamfe));
+ damage += ddamfe->damage;
}
@@ -268,7 +268,7 @@ void blood_fineff::fire()
bleed_onto_floor(posn, mtype, blood, true);
}
-void kraken_damage_fineff::fire()
+void deferred_damage_fineff::fire()
{
if (actor *df = defender())
df->hurt(attacker(), damage);