summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/kills.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-03-21 02:11:46 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-03-21 02:46:41 +0100
commitd0ed0c66e54464ab94317682327a84aa4122fad0 (patch)
treeb4a602d2c5922bc078f07c48b2eee4483d7da9a4 /crawl-ref/source/kills.cc
parent630cb13277100dd2dfbdd6881b64086b5580405f (diff)
downloadcrawl-ref-d0ed0c66e54464ab94317682327a84aa4122fad0.tar.gz
crawl-ref-d0ed0c66e54464ab94317682327a84aa4122fad0.zip
Remove the small/large zombie distinction.
It leads to no end of problems, and its only purpose was showing 'z'/'Z' glyphs. Note: custom monster glyphs on the main screen are broken since af76f80.
Diffstat (limited to 'crawl-ref/source/kills.cc')
-rw-r--r--crawl-ref/source/kills.cc17
1 files changed, 17 insertions, 0 deletions
diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc
index 3744930ed1..0c6d13f9b4 100644
--- a/crawl-ref/source/kills.cc
+++ b/crawl-ref/source/kills.cc
@@ -661,13 +661,22 @@ kill_monster_desc::kill_monster_desc(const monster* mon)
modifier = M_NORMAL;
switch (mon->type)
{
+ case MONS_ZOMBIE:
+#if TAG_MAJOR_VERSION == 34
case MONS_ZOMBIE_LARGE: case MONS_ZOMBIE_SMALL:
+#endif
modifier = M_ZOMBIE;
break;
+ case MONS_SKELETON:
+#if TAG_MAJOR_VERSION == 34
case MONS_SKELETON_LARGE: case MONS_SKELETON_SMALL:
+#endif
modifier = M_SKELETON;
break;
+ case MONS_SIMULACRUM:
+#if TAG_MAJOR_VERSION == 34
case MONS_SIMULACRUM_LARGE: case MONS_SIMULACRUM_SMALL:
+#endif
modifier = M_SIMULACRUM;
break;
case MONS_SPECTRAL_THING:
@@ -688,13 +697,21 @@ kill_monster_desc::kill_monster_desc(const monster_info& mon)
modifier = M_NORMAL;
switch (mon.type)
{
+#if TAG_MAJOR_VERSION == 34
case MONS_ZOMBIE_LARGE: case MONS_ZOMBIE_SMALL:
+#endif
modifier = M_ZOMBIE;
break;
+ case MONS_SKELETON:
+#if TAG_MAJOR_VERSION == 34
case MONS_SKELETON_LARGE: case MONS_SKELETON_SMALL:
+#endif
modifier = M_SKELETON;
break;
+ case MONS_SIMULACRUM:
+#if TAG_MAJOR_VERSION == 34
case MONS_SIMULACRUM_LARGE: case MONS_SIMULACRUM_SMALL:
+#endif
modifier = M_SIMULACRUM;
break;
case MONS_SPECTRAL_THING: