diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-04-25 22:38:21 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-04-25 22:38:21 +0200 |
| commit | ca96156951bf69e87e50d81448e0bce7a0f71a5e (patch) | |
| tree | 70b4d478d6c4f68e16500d71fa8a247ac4796c90 /crawl-ref/source/mapmark.cc | |
| parent | e8da5e6c01950dd649f90030a2c77654480e4369 (diff) | |
| download | crawl-ref-ca96156951bf69e87e50d81448e0bce7a0f71a5e.tar.gz crawl-ref-ca96156951bf69e87e50d81448e0bce7a0f71a5e.zip | |
Drop TAG_MAJOR_VERSION == 32 ifdefs.
Diffstat (limited to 'crawl-ref/source/mapmark.cc')
| -rw-r--r-- | crawl-ref/source/mapmark.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc index 7c8f3690c5..cade0020db 100644 --- a/crawl-ref/source/mapmark.cc +++ b/crawl-ref/source/mapmark.cc @@ -691,12 +691,7 @@ void map_phoenix_marker::read(reader &in) duration = unmarshallShort(in); mon_num = unmarshallShort(in); behaviour = static_cast<beh_type>(unmarshallUByte(in)); -#if TAG_MAJOR_VERSION == 32 - if (in.getMinorVersion() < TAG_MINOR_PHOENIX_ATTITUDE) - attitude = ATT_HOSTILE; - else -#endif - attitude = static_cast<mon_attitude_type>(unmarshallUByte(in)); + attitude = static_cast<mon_attitude_type>(unmarshallUByte(in)); god = static_cast<god_type>(unmarshallByte(in)); corpse_pos = unmarshallCoord(in); } |