From f6fed038294b736f9f1c2bd5c6d8686cc900b56d Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 5 Nov 2009 20:48:01 -0600 Subject: Remove the rest of the M_EVIL references. --- crawl-ref/source/mon-data.h | 17 +++++++---------- crawl-ref/source/mon-util.h | 3 ++- crawl-ref/source/monster.cc | 3 --- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index a58cd34c73..c6c29c321e 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -458,8 +458,7 @@ static monsterentry mondata[] = { { MONS_DRACONIAN_KNIGHT, 'd', CYAN, "draconian knight", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_FIGHTER | M_COLD_BLOOD | M_EVIL - | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_FIGHTER | M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -550,7 +549,7 @@ static monsterentry mondata[] = { { MONS_DEEP_ELF_MAGE, 'e', MAGENTA, "deep elf mage", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -572,7 +571,7 @@ static monsterentry mondata[] = { { MONS_DEEP_ELF_CONJURER, 'e', BLUE, "deep elf conjurer", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, 450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -2498,8 +2497,7 @@ static monsterentry mondata[] = { { MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_EVIL - | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, 1300, 16, MONS_OGRE, MONS_OGRE, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -3120,8 +3118,7 @@ static monsterentry mondata[] = { { MONS_HELL_KNIGHT, '@', RED, "hell knight", - M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL - | M_SPEAKS, + M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, mrd(MR_RES_FIRE, 2), 550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -3143,7 +3140,7 @@ static monsterentry mondata[] = { { MONS_WIZARD, '@', MAGENTA, "wizard", - M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, + M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_NO_FLAGS, 550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -4166,7 +4163,7 @@ static monsterentry mondata[] = { { MONS_EROLCHA, 'O', LIGHTBLUE, "Erolcha", M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD - | M_EVIL | M_SPEAKS, + | M_SPEAKS, MR_NO_FLAGS, 1300, 20, MONS_OGRE, MONS_OGRE, MH_NATURAL, -7, { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 3ef2ce3f46..e8a35999df 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -132,7 +132,8 @@ enum mons_class_flags // drainable by vampires M_REGEN = (1<<18), // regenerates quickly M_BURROWS = (1<<19), // monster digs through rock - M_EVIL = (1<<20), // monster vulnerable to holy spells + + M_UNUSED_3 = (1<<20), M_UNIQUE = (1<<21), // monster is a unique M_ACID_SPLASH = (1<<22), // Passive acid splash when hit. diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index bc1836a8ce..924042a1ff 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2892,9 +2892,6 @@ bool monsters::is_evil() const return (true); } - if (mons_class_flag(type, M_EVIL)) - return (true); - return (false); } -- cgit v1.2.3-54-g00ecf