summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tags.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-24 09:36:00 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-24 09:36:00 +0000
commitd2cdd021c717fcc16134b3943543b01d710181f1 (patch)
treef61a275d8b7dc20d2e9b462c36282a6ef597d544 /crawl-ref/source/tags.cc
parent7e0d56433b95ea95b2cc06dfbc98d7887a50b968 (diff)
downloadcrawl-ref-d2cdd021c717fcc16134b3943543b01d710181f1.tar.gz
crawl-ref-d2cdd021c717fcc16134b3943543b01d710181f1.zip
Portal vault entries now show up on the overmap. Breaks savefile
compatabilty. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7583 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tags.cc')
-rw-r--r--crawl-ref/source/tags.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 34f510109b..3e6c484140 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -91,6 +91,8 @@ extern std::map<branch_type, level_id> stair_level;
extern std::map<level_pos, shop_type> shops_present;
extern std::map<level_pos, god_type> altars_present;
extern std::map<level_pos, portal_type> portals_present;
+extern std::map<level_pos, std::string> portal_vaults_present;
+extern std::map<level_pos, char> portal_vault_colours;
extern std::map<level_id, std::string> level_annotations;
// temp file pairs used for file level cleanup
@@ -213,7 +215,7 @@ int read2(FILE * file, void *buffer, unsigned int count)
return fread(buffer, 1, count, file);
}
-void marshallByte(writer &th, char data)
+void marshallByte(writer &th, const char& data)
{
th.writeByte(data);
}
@@ -1122,6 +1124,10 @@ static void tag_construct_you_dungeon(writer &th)
marshall_level_pos, marshall_as_long<god_type>);
marshallMap(th, portals_present,
marshall_level_pos, marshall_as_long<portal_type>);
+ marshallMap(th, portal_vaults_present,
+ marshall_level_pos, marshallStringNoMax);
+ marshallMap(th, portal_vault_colours,
+ marshall_level_pos, marshallByte);
marshallMap(th, level_annotations,
marshall_level_id, marshallStringNoMax);
@@ -1575,6 +1581,10 @@ static void tag_read_you_dungeon(reader &th)
unmarshall_level_pos, unmarshall_long_as<god_type>);
unmarshallMap(th, portals_present,
unmarshall_level_pos, unmarshall_long_as<portal_type>);
+ unmarshallMap(th, portal_vaults_present,
+ unmarshall_level_pos, unmarshallStringNoMax);
+ unmarshallMap(th, portal_vault_colours,
+ unmarshall_level_pos, unmarshallByte);
unmarshallMap(th, level_annotations,
unmarshall_level_id, unmarshallStringNoMax);