summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/zotdef.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-12-27 03:39:19 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-12-27 03:41:28 +0100
commitb977035ac9fa2b057acff85268f4d974338c550c (patch)
tree6148a15d3e2190b5d057917fa438f35668392a63 /crawl-ref/source/zotdef.cc
parentfef21cf8959f9dda4194e835ae27c5df0c70d6c1 (diff)
downloadcrawl-ref-b977035ac9fa2b057acff85268f4d974338c550c.tar.gz
crawl-ref-b977035ac9fa2b057acff85268f4d974338c550c.zip
Take away xmas.
This reverts commit b0c9531a8997436f0bddfa218105d2e67c16f2ce. This reverts commit 054e7ae2f5fb42c12dc169898259e58f2dc5a77b, reversing changes made to 1ddc8957bd848179aac795187f07496f02932644.
Diffstat (limited to 'crawl-ref/source/zotdef.cc')
-rw-r--r--crawl-ref/source/zotdef.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/zotdef.cc b/crawl-ref/source/zotdef.cc
index a9ceece72f..9753ca9fe9 100644
--- a/crawl-ref/source/zotdef.cc
+++ b/crawl-ref/source/zotdef.cc
@@ -416,15 +416,15 @@ static void _giant_wave(int power)
_zotdef_danger_msg("The stamp of enormous boots can be heard in the distance.");
}
-static void _reindeer_wave(int power)
+static void _yak_wave(int power)
{
wave_name("YAK WAVE");
- monster_type reindeers[] = {MONS_SHEEP, MONS_YAK, MONS_DEATH_YAK,
+ monster_type yaks[] = {MONS_SHEEP, MONS_YAK, MONS_DEATH_YAK,
MONS_SHEEP, MONS_YAK, MONS_DEATH_YAK,
MONS_SHEEP, MONS_YAK, MONS_DEATH_YAK,
MONS_CYCLOPS, END};
monster_type boss[] = {MONS_POLYPHEMUS, MONS_CYCLOPS, END};
- _zotdef_fill_from_list(reindeers, 0, power); // full
+ _zotdef_fill_from_list(yaks, 0, power); // full
_zotdef_choose_boss(boss, power);
_zotdef_danger_msg("Bleats and roars echo around!");
}
@@ -510,7 +510,7 @@ static void _zotdef_set_special_wave(int power)
case 13: wave_fn = _bear_wave; wpow = 6; break;
case 14: wave_fn = _wraith_wave; wpow = 8; break;
case 15: wave_fn = _giant_wave; wpow = 16; break;
- case 16: wave_fn = _reindeer_wave; wpow = 12; break; // lots of bands
+ case 16: wave_fn = _yak_wave; wpow = 12; break; // lots of bands
case 17: wave_fn = _insect_wave; wpow = 4; break;
case 18: wave_fn = _pan_wave; wpow = 24; break;
// extra copies of fire and cold at higher power