summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorMatthew Cline <zelgadis@sourceforge.net>2009-11-20 20:47:07 -0800
committerMatthew Cline <zelgadis@sourceforge.net>2009-11-20 20:47:07 -0800
commit37c7bf6bdee14c94b5340ce5adfd166d580705d1 (patch)
treec8eac7a36f349fa2a52864fac6d90b23ca272181 /crawl-ref/source
parent0c0e03aa42471d8d791cdd5bbd9503455623b740 (diff)
downloadcrawl-ref-37c7bf6bdee14c94b5340ce5adfd166d580705d1.tar.gz
crawl-ref-37c7bf6bdee14c94b5340ce5adfd166d580705d1.zip
monster lookup: Don't show tile for dancing weapon
Generating a temporary dancing weapon monster to diplsay in the monster lookup menu (?/M) is somewhat hackish; implement it later (as opposed to crashing).
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/command.cc14
1 files changed, 13 insertions, 1 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index eec98f4608..a45c4aaed2 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1725,6 +1725,7 @@ static bool _find_description(bool &again, std::string& error_inout)
fake_mon.type = m_type;
define_monster(fake_mon);
+ // FIXME: This doesn't generate proper draconian monsters.
monster_list.push_back(fake_mon);
#ifndef USE_TILE
@@ -1743,7 +1744,18 @@ static bool _find_description(bool &again, std::string& error_inout)
str = prefix + str;
#endif
- me = new MonsterMenuEntry(str, &(monster_list.back()), letter);
+ // FIXME: Properly set up a dancing weapon monster to
+ // show in tiles. There must be a weapon item in mitm[],
+ // which the dancing weapon has wielded.
+ if (m_type != MONS_DANCING_WEAPON)
+ me = new MonsterMenuEntry(str, &(monster_list.back()),
+ letter);
+ else
+ {
+ me = new MenuEntry(str, MEL_ITEM, 1, letter);
+
+ me->data = (void*) &(monster_list.back());
+ }
}
else
{