summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mgen_data.h
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2010-09-17 10:44:56 +0200
committerRobert Vollmert <rvollmert@gmx.net>2010-09-17 10:44:56 +0200
commit86ea48af2bb4792563e7a2966981f665ce16388e (patch)
tree16826ba63c055a3fa9aed302a7a9e7d0c6918251 /crawl-ref/source/mgen_data.h
parentc150a30e66063d05255b2c20391da32b85dd55d8 (diff)
downloadcrawl-ref-86ea48af2bb4792563e7a2966981f665ce16388e.tar.gz
crawl-ref-86ea48af2bb4792563e7a2966981f665ce16388e.zip
Pass weapon into monster generation code for Tukima's Dance.
This seems to be a bit cleaner, and allows fixing issue #2597 (incorrect "comes into view" message when Xom animates your weapon during a delay). The message order is still wrong, but that's a different issue.
Diffstat (limited to 'crawl-ref/source/mgen_data.h')
-rw-r--r--crawl-ref/source/mgen_data.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h
index d1376d1564..aa47ebbab0 100644
--- a/crawl-ref/source/mgen_data.h
+++ b/crawl-ref/source/mgen_data.h
@@ -4,6 +4,10 @@
#include "mgen_enum.h"
#include "player.h"
+// Hash key for passing a weapon to be given to
+// a dancing weapon.
+const std::string TUKIMA_WEAPON = "tukima-weapon";
+
// A structure with all the data needed to whip up a new monster.
struct mgen_data
{