summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mapdef.cc
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2009-11-30 20:32:41 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2009-11-30 20:32:41 +1000
commit941444076c26e5e5149c6368a4261d60842fe3ec (patch)
treef65e3e46138ecbe847cd10daf9fe021d15cd5398 /crawl-ref/source/mapdef.cc
parent7344fbfdf965f22284ac3ad73057d89643eeac9c (diff)
downloadcrawl-ref-941444076c26e5e5149c6368a4261d60842fe3ec.tar.gz
crawl-ref-941444076c26e5e5149c6368a4261d60842fe3ec.zip
Convert dgn.set_border_fill_type to BORDER.
The Lua prelude of maps isn't executed early enough now. Using 'BORDER' sets map->border_fill_type as soon as the map is read, rather than after it is placed. This commit increases the value of MAP_CACHE_VERSION. Can be reverted if it causes issues or is unwanted.
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
-rw-r--r--crawl-ref/source/mapdef.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 2d04e483be..9684032f2e 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -1989,6 +1989,7 @@ void map_def::write_index(writer& outf) const
marshallString4(outf, place_loaded_from.filename);
marshallLong(outf, place_loaded_from.lineno);
marshallShort(outf, orient);
+ marshallShort(outf, static_cast<short>(border_fill_type));
marshallLong(outf, chance_priority);
marshallLong(outf, chance);
marshallLong(outf, weight);
@@ -2005,6 +2006,7 @@ void map_def::read_index(reader& inf)
unmarshallString4(inf, place_loaded_from.filename);
place_loaded_from.lineno = unmarshallLong(inf);
orient = static_cast<map_section_type>( unmarshallShort(inf) );
+ border_fill_type = static_cast<dungeon_feature_type>( unmarshallShort(inf) );
chance_priority = unmarshallLong(inf);
chance = unmarshallLong(inf);
weight = unmarshallLong(inf);