Allow "any trap" and "any shop" (alternatives to "random trap" and "random

shop") in des files.

Allow using '8', '9' and '0' in monster specifications.

Tossed out some unused functions.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1281 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index 7f0a21eecc..238df8957a 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -155,13 +155,14 @@ private:
 struct mons_spec
 {
     int mid;
-    int genweight;
+    int  genweight, mlevel;
     bool fix_mons;
     bool generate_awake;
 
-    mons_spec(int id = RANDOM_MONSTER, int gw = 10, bool _fixmons = false,
-              bool awaken = false)
-        : mid(id), genweight(gw), fix_mons(_fixmons), generate_awake(awaken)
+    mons_spec(int id = RANDOM_MONSTER, int gw = 10, int ml = 0,
+              bool _fixmons = false, bool awaken = false)
+        : mid(id), genweight(gw), mlevel(ml), fix_mons(_fixmons),
+          generate_awake(awaken)
     {
     }
 };