summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-10-16 11:46:50 +0200
committerRobert Vollmert <rvollmert@gmx.net>2009-10-16 11:48:11 +0200
commit403d55fd98777e5064af85b3497813bf4352e0eb (patch)
tree5596f6e4c6c630a954309cf2f8b155bef55b2521 /crawl-ref/source/spells2.cc
parente0f64f36d01badee2d42839f467b0cfbc8867da5 (diff)
downloadcrawl-ref-403d55fd98777e5064af85b3497813bf4352e0eb.tar.gz
crawl-ref-403d55fd98777e5064af85b3497813bf4352e0eb.zip
Revert radiance and refrigeration patches for the moment.
There's a couple of issues with these that were missed. This reverts commits 70c41610927b7f9adfc3a0fd6c72c7af6756427e dce44e60507ec723f3cf94cdeadc6762ee492786 6525d257d208e990f5d62213adf6a062943e6626 6d9b6f226847487b3fd9e2ff408d7c0f42361c93.
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc34
1 files changed, 8 insertions, 26 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 896ebb8d87..cec9e6ce30 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -509,21 +509,9 @@ static std::string _describe_monsters(const counted_monster_list &list)
// Poisonous light passes right through invisible players
// and monsters, and so, they are unaffected by this spell --
// assumes only you can cast this spell (or would want to).
-void cast_toxic_radiance(bool monster_cast)
+void cast_toxic_radiance()
{
- kill_category kc;
-
- if (monster_cast)
- {
- mpr("Sickly green light fills the air!");
- // Friendlies will never cast this.
- kc = KC_OTHER;
- }
- else
- {
- mpr("You radiate a sickly green light!");
- kc = KC_YOU;
- }
+ mpr("You radiate a sickly green light!");
you.flash_colour = GREEN;
viewwindow(true, false);
@@ -555,9 +543,9 @@ void cast_toxic_radiance(bool monster_cast)
if (!monster->has_ench(ENCH_INVIS))
{
bool affected =
- poison_monster(monster, kc, 1, false, false);
+ poison_monster(monster, KC_YOU, 1, false, false);
- if (coinflip() && poison_monster(monster, kc, false, false))
+ if (coinflip() && poison_monster(monster, KC_YOU, false, false))
affected = true;
if (affected)
@@ -589,7 +577,7 @@ void cast_toxic_radiance(bool monster_cast)
}
}
-void cast_refrigeration(int pow, bool monster_cast, int caster)
+void cast_refrigeration(int pow)
{
mpr("The heat is drained from your surroundings.");
@@ -605,7 +593,7 @@ void cast_refrigeration(int pow, bool monster_cast, int caster)
if (hurted > 0)
{
mpr("You feel very cold.");
- ouch(hurted, caster, KILLED_BY_FREEZING);
+ ouch(hurted, NON_MONSTER, KILLED_BY_FREEZING);
// Note: this used to be 12!... and it was also applied even if
// the player didn't take damage from the cold, so we're being
@@ -646,10 +634,7 @@ void cast_refrigeration(int pow, bool monster_cast, int caster)
// Set up the cold attack.
bolt beam;
beam.flavour = BEAM_COLD;
- if (monster_cast)
- beam.thrower = KILL_MON;
- else
- beam.thrower = KILL_YOU;
+ beam.thrower = KILL_YOU;
for (int i = 0; i < MAX_MONSTERS; i++)
{
@@ -661,10 +646,7 @@ void cast_refrigeration(int pow, bool monster_cast, int caster)
{
// Calculate damage and apply.
int hurt = mons_adjust_flavoured(monster, beam, dam_dice.roll());
- if (monster_cast)
- monster->hurt(NULL, hurt, BEAM_COLD);
- else
- monster->hurt(&you, hurt, BEAM_COLD);
+ monster->hurt(&you, hurt, BEAM_COLD);
// Cold-blooded creatures can be slowed.
if (monster->alive()