diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-13 15:35:14 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-13 15:35:14 +0000 |
commit | 84912ad5cf2a8bbc40a7a6e4f3aa8607c04238d6 (patch) | |
tree | dace1bf8c80c1e8dd5e18f5db87a7ecb30f138d2 /crawl-ref/source | |
parent | 14548892e26d872d3e51d7e6a4ba05deae29d4b0 (diff) | |
download | crawl-ref-84912ad5cf2a8bbc40a7a6e4f3aa8607c04238d6.tar.gz crawl-ref-84912ad5cf2a8bbc40a7a6e4f3aa8607c04238d6.zip |
Abolish M_HUMANOID flag as it wasn't used anywhere. Comments claimed
it was necessary for Glamour but even that appears to have used
another function, mons_is_humanoid(), that made checks against
monster glyph instead. Strange.
So in case anyone is badly in need of a monster flag, no. 15 is free! :)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3623 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/mon-data.h | 39 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.cc | 39 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.h | 3 |
3 files changed, 21 insertions, 60 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index c0cc38e97f..5a84ccbebe 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -256,7 +256,7 @@ // now store the draconian subspecies in the high byte of mon->number // for those listed as species MONS_DRACONIAN. MONS_DRACONIAN, 'd', BROWN, "draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -1, { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -267,7 +267,7 @@ { MONS_BLACK_DRACONIAN, 'd', BLUE, "black draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_COLD_BLOOD | M_SPEAKS, MR_RES_ELEC, 900, 10, MONS_DRACONIAN, MONS_BLACK_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -278,7 +278,7 @@ { MONS_YELLOW_DRACONIAN, 'd', YELLOW, "yellow draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS, + M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS, MR_RES_ACID, 900, 10, MONS_DRACONIAN, MONS_YELLOW_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -289,7 +289,7 @@ { MONS_PALE_DRACONIAN, 'd', LIGHTGREY, "pale draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_COLD_BLOOD | M_SPEAKS, MR_RES_STEAM, 900, 10, MONS_DRACONIAN, MONS_PALE_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -300,7 +300,7 @@ { MONS_GREEN_DRACONIAN, 'd', GREEN, "green draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_COLD_BLOOD | M_SPEAKS, MR_RES_POISON, 900, 10, MONS_DRACONIAN, MONS_GREEN_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -311,7 +311,7 @@ { MONS_PURPLE_DRACONIAN, 'd', MAGENTA, "purple draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_PURPLE_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -322,7 +322,7 @@ { MONS_RED_DRACONIAN, 'd', RED, "red draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS, + M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS, MR_RES_FIRE, 900, 10, MONS_DRACONIAN, MONS_RED_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -333,7 +333,7 @@ { MONS_WHITE_DRACONIAN, 'd', WHITE, "white draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS, + M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS, MR_RES_COLD, 900, 10, MONS_DRACONIAN, MONS_WHITE_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -344,7 +344,7 @@ { MONS_MOTTLED_DRACONIAN, 'd', LIGHTMAGENTA, "mottled draconian", - M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_COLD_BLOOD | M_SPEAKS, MR_RES_FIRE | MR_RES_STICKY_FLAME, 900, 10, MONS_DRACONIAN, MONS_MOTTLED_DRACONIAN, MH_NATURAL, -2, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -355,7 +355,7 @@ { MONS_DRACONIAN_CALLER, 'd', BROWN, "draconian caller", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -366,7 +366,7 @@ { MONS_DRACONIAN_MONK, 'd', BLUE, "draconian monk", - M_FIGHTER | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_FIGHTER | M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 35}, {AT_HIT, AF_PLAIN, 20}, @@ -378,7 +378,7 @@ { MONS_DRACONIAN_ZEALOT, 'd', LIGHTGREEN, "draconian zealot", - M_SPELLCASTER | M_HUMANOID | M_PRIEST | M_COLD_BLOOD | M_EVIL | M_SPEAKS, + M_SPELLCASTER | M_PRIEST | M_COLD_BLOOD | M_EVIL | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -389,7 +389,7 @@ { MONS_DRACONIAN_SHIFTER, 'd', LIGHTCYAN, "draconian shifter", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -400,7 +400,7 @@ { MONS_DRACONIAN_ANNIHILATOR, 'd', LIGHTBLUE, "draconian annihilator", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS, + M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS, MR_NO_FLAGS, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -411,7 +411,7 @@ { MONS_DRACONIAN_KNIGHT, 'd', CYAN, "draconian knight", - M_SPELLCASTER | M_HUMANOID | M_FIGHTER | M_COLD_BLOOD | M_SPEAKS, + M_SPELLCASTER | 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_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} }, @@ -422,7 +422,7 @@ { MONS_DRACONIAN_SCORCHER, 'd', LIGHTRED, "draconian scorcher", - M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_EVIL + M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL | M_SPEAKS, MR_RES_FIRE | MR_RES_HELLFIRE, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, @@ -939,7 +939,7 @@ // merfolk ('m') { MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk fighter", - M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS, + M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS, MR_RES_POISON | MR_RES_COLD, 500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -950,7 +950,7 @@ { MONS_MERMAID, 'm', LIGHTCYAN, "mermaid", - M_SPELLCASTER | M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS, + M_SPELLCASTER | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS, MR_RES_POISON | MR_RES_COLD, 500, 10, MONS_MERMAID, MONS_MERMAID, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, @@ -3805,8 +3805,7 @@ { MONS_TIAMAT, 'd', MAGENTA, "Tiamat", - M_HUMANOID | M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD - | M_SPEAKS, + M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD | M_SPEAKS, MR_RES_POISON, 0, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 35}, {AT_TAIL_SLAP, AF_PLAIN, 25}, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 104de1f101..edbb7de93a 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -467,42 +467,6 @@ bool mons_is_demon( int mc ) return (false); } -// Used for elven Glamour ability. -- bwr -bool mons_is_humanoid( int mc ) -{ - switch (mons_char( mc)) - { - case 'o': // orcs - case 'e': // elvens (deep) - case 'c': // centaurs - case 'C': // giants - case 'O': // ogres - case 'K': // kobolds - case 'N': // nagas - case '@': // adventuring humans - case 'T': // trolls - return (true); - - case 'm': // merfolk - if (mc == MONS_MERFOLK || mc == MONS_MERMAID) - return (true); - return (false); - - case 'g': // goblines, hobgoblins, gnolls, boggarts -- but not gargoyles - if (mc != MONS_GARGOYLE - && mc != MONS_METAL_GARGOYLE - && mc != MONS_MOLTEN_GARGOYLE) - { - return (true); - } - - default: - break; - } - - return (false); -} - int mons_zombie_size(int mc) { return (smc->zombie_size); @@ -5642,8 +5606,7 @@ mon_body_shape get_mon_shape(const int type) case 'c': // centaurs return(MON_SHAPE_CENTAUR); case 'd': // draconions and drakes - if (mons_genus(type) == MONS_DRACONIAN - || mons_class_flag(type, M_HUMANOID)) + if (mons_genus(type) == MONS_DRACONIAN) { if (mons_class_flag(type, M_FLIES)) return(MON_SHAPE_HUMANOID_WINGED_TAILED); diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 183c6be382..2aad04d707 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -104,7 +104,7 @@ enum mons_class_flags M_SPLITS = (1<<12), // monster can split M_AMPHIBIOUS = (1<<13), // monster can swim in water, M_THICK_SKIN = (1<<14), // monster has more effective AC, - M_HUMANOID = (1<<15), // for Glamour + M_RESERVED = (1<<15), // currently UNUSED M_COLD_BLOOD = (1<<16), // susceptible to cold M_WARM_BLOOD = (1<<17), // no effect currently M_REGEN = (1<<18), // regenerates quickly @@ -477,7 +477,6 @@ mon_holy_type mons_holiness(const monsters *); bool mons_is_mimic( int mc ); bool mons_is_statue(int mc); bool mons_is_demon( int mc ); -bool mons_is_humanoid( int mc ); bool mons_wields_two_weapons(const monsters *m); bool mons_wields_two_weapons(monster_type m); |