diff options
author | Adam Borowski <kilobyte@angband.pl> | 2011-01-09 16:37:42 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2011-01-09 23:07:38 +0100 |
commit | 52b7544e8eed3aee8228fbdfe939f11e1bab61aa (patch) | |
tree | 47a32e3bea42bdf0e87dda37cbb0eb255d3011cf /crawl-ref/source/mapmark.cc | |
parent | 4239314eb169490cebb6ecb04d5c0e800882dc0e (diff) | |
download | crawl-ref-52b7544e8eed3aee8228fbdfe939f11e1bab61aa.tar.gz crawl-ref-52b7544e8eed3aee8228fbdfe939f11e1bab61aa.zip |
Bump the major version, purge shims, fix breakage.
Diffstat (limited to 'crawl-ref/source/mapmark.cc')
-rw-r--r-- | crawl-ref/source/mapmark.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc index c9a8ba2bd6..18a3337f38 100644 --- a/crawl-ref/source/mapmark.cc +++ b/crawl-ref/source/mapmark.cc @@ -634,40 +634,13 @@ void map_malign_gateway_marker::write(writer &out) const void map_malign_gateway_marker::read(reader &in) { - int minorVersion = in.getMinorVersion(); - map_marker::read(in); duration = unmarshallShort(in); is_player = unmarshallBoolean(in); -#if TAG_MAJOR_VERSION == 31 - if (minorVersion < TAG_MINOR_MALIGN) - monster_summoned = true; - else -#endif monster_summoned = unmarshallBoolean(in); -#if TAG_MAJOR_VERSION == 31 - if (minorVersion < TAG_MINOR_FIX_MG) - { - summoner_string = ""; - behaviour = BEH_HOSTILE; - } - else - { -#endif summoner_string = unmarshallString(in); behaviour = static_cast<beh_type>(unmarshallUByte(in)); -#if TAG_MAJOR_VERSION == 31 - } -#endif - -#if TAG_MAJOR_VERSION == 31 - if (!is_player && minorVersion < TAG_MINOR_FIX_MG) - { - monster caster; - unmarshallMonster(in, caster); - } -#endif god = static_cast<god_type>(unmarshallByte(in)); power = unmarshallShort(in); |