diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-27 01:35:41 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-27 02:32:06 +0100 |
| commit | 928479a2ce6674d27d6ef03d7a06f81803ccdfae (patch) | |
| tree | f9c1a9ddd869efe1e725e870519cfc83b0259f75 /crawl-ref/source/tags.cc | |
| parent | 2c33ddb4c83370db12567cdddaa7f4fe696481c9 (diff) | |
| download | crawl-ref-928479a2ce6674d27d6ef03d7a06f81803ccdfae.tar.gz crawl-ref-928479a2ce6674d27d6ef03d7a06f81803ccdfae.zip | |
Convert some ints to monster_type.
There's a whole lot of places that pass monster_type as int, often
with varying meanings for the value -1. This moves some of these
to monster_type, introducing MONS_NO_MONSTER and MONS_PLAYER as
new invalid special values.
Also improve on the autoexclude descriptions.
Diffstat (limited to 'crawl-ref/source/tags.cc')
| -rw-r--r-- | crawl-ref/source/tags.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index ab02149019..6678f498de 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -2174,7 +2174,7 @@ static void unmarshall_monster(reader &th, monsters &m) } m.ench_countdown = unmarshallByte(th); - m.type = unmarshallShort(th); + m.type = static_cast<monster_type>(unmarshallShort(th)); m.hit_points = unmarshallShort(th); m.max_hit_points = unmarshallShort(th); m.number = unmarshallShort(th); @@ -2217,7 +2217,7 @@ static void tag_read_level_monsters(reader &th, char minorVersion) monsters &m = menv[i]; unmarshall_monster(th, m); // place monster - if (m.type != -1) + if (m.type != MONS_NO_MONSTER) { #if defined(DEBUG) || defined(DEBUG_MONS_SCAN) int midx = mgrd(m.pos()); |