Merge branch 'master' into portal_branches

1 files changed, 9 insertions, 9 deletions

diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index da6daddd33..d81ee113ef 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -588,8 +588,8 @@ public:
     void clear();
 
     item_spec get_item(int index);
-    item_spec random_item ();
-    item_spec random_item_weighted ();
+    item_spec random_item();
+    item_spec random_item_weighted();
     size_t size() const { return items.size(); }
     bool empty() const { return items.empty(); }
 
@@ -631,7 +631,7 @@ private:
 class mons_spec
 {
  public:
-    int mid;
+    int type;
     level_id place;
     monster_type monbase;     // Base monster for zombies and dracs.
     mon_attitude_type attitude;
@@ -665,12 +665,12 @@ class mons_spec
 
     CrawlHashTable props;
 
-    mons_spec(int id = RANDOM_MONSTER,
+    mons_spec(int t = RANDOM_MONSTER,
               monster_type base = MONS_NO_MONSTER,
               int num = 0,
               int gw = 10, int ml = 0,
               bool _fixmons = false, bool awaken = false, bool patrol = false)
-        : mid(id), place(), monbase(base), attitude(ATT_HOSTILE), number(num),
+        : type(t), place(), monbase(base), attitude(ATT_HOSTILE), number(num),
           quantity(1), genweight(gw), mlevel(ml), fix_mons(_fixmons),
           generate_awake(awaken), patrolling(false), band(false),
           colour(BLACK), god(GOD_NO_GOD), god_gift(false), hd(0), hp(0),
@@ -780,8 +780,8 @@ struct shop_spec
 
     bool use_all;       /**< True if all items in `items` should be used. */
 
-    shop_spec (shop_type sh, std::string n="", std::string t="",
-               std::string s="", int g=-1, int ni=-1, bool u=false)
+    shop_spec(shop_type sh, std::string n="", std::string t="",
+              std::string s="", int g=-1, int ni=-1, bool u=false)
         : sh_type(sh), name(n), type(t), suffix(s),
           greed(g), num_items(ni), items(), use_all(u) { }
 };
@@ -797,7 +797,7 @@ struct shop_spec
 struct trap_spec
 {
     trap_type tr_type; /*> One of the trap_type enum values. */
-    trap_spec (trap_type tr)
+    trap_spec(trap_type tr)
         : tr_type(static_cast<trap_type>(tr)) { }
 };
 
@@ -825,7 +825,7 @@ struct feature_spec
     feature_spec(int f, int wt = 10, int _mimic = 0, bool _no_mimic = false);
     feature_spec(const feature_spec& other);
     feature_spec& operator = (const feature_spec& other);
-    void init_with (const feature_spec& other);
+    void init_with(const feature_spec& other);
 };
 
 typedef std::vector<feature_spec> feature_spec_list;