summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mapdef.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-01-03 06:45:31 +0100
committerAdam Borowski <kilobyte@angband.pl>2012-01-05 06:11:45 +0100
commitfd48a9d6780877de27d900f3f29e59899971e0f1 (patch)
tree3681bfe51412bfb6970cef5b2004f0f251a69eaa /crawl-ref/source/mapdef.h
parentff3529c667725c3838520c6d96e1dc7d16f75d26 (diff)
downloadcrawl-ref-fd48a9d6780877de27d900f3f29e59899971e0f1.tar.gz
crawl-ref-fd48a9d6780877de27d900f3f29e59899971e0f1.zip
s/(mons_spec)\.mid/$1.type/
Diffstat (limited to 'crawl-ref/source/mapdef.h')
-rw-r--r--crawl-ref/source/mapdef.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index 393b310ed0..6743e4f234 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -632,7 +632,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;
@@ -666,12 +666,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),