Added elf arrival vaults (Eino).

Tweaked dungeon builder so you always land on { on level 1 of a branch (using a
map marker to identify which stair was a {).

Maps with the "uniq" tag will be used only once in a game. Maps with a
"uniq_foo" tag will be used only once, and will also prevent any other maps
tagged "uniq_foo" from being used thereafter. Breaks saves.

Oklob plants should not receive stab brands, fixed.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1897 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 3 deletions

diff --git a/crawl-ref/source/tags.h b/crawl-ref/source/tags.h
index 154cdef1ad..ebc61c6d4d 100644
--- a/crawl-ref/source/tags.h
+++ b/crawl-ref/source/tags.h
@@ -39,7 +39,8 @@ void marshallShort(struct tagHeader &th, short data);
 void marshallLong(struct tagHeader &th, long data);
 void marshallFloat(struct tagHeader &th, float data);
 void marshallBoolean(struct tagHeader &th, bool data);
-void marshallString(struct tagHeader &th, const char *data, int maxSize = 0);
+void marshallString(struct tagHeader &th, const std::string &data,
+                    int maxSize = 0);
 void marshallCoord(tagHeader &th, const coord_def &c);
 
 // last updated 22jan2001 {gdl}
@@ -51,8 +52,8 @@ short unmarshallShort(struct tagHeader &th);
 long unmarshallLong(struct tagHeader &th);
 float unmarshallFloat(struct tagHeader &th);
 bool unmarshallBoolean(struct tagHeader &th);
-void unmarshallString(struct tagHeader &th, char *data, int maxSize);
-std::string unmarshallString(tagHeader &th, int maxSize);
+void unmarshallCString(struct tagHeader &th, char *data, int maxSize);
+std::string unmarshallString(tagHeader &th, int maxSize = 1000);
 void unmarshallCoord(tagHeader &th, coord_def &c);
 
 std::string make_date_string( time_t in_date );