From f2a19d9971bb076f4a80a9e41ba601bc862d0fdf Mon Sep 17 00:00:00 2001 From: dshaligram Date: Thu, 26 Jul 2007 11:06:09 +0000 Subject: Replaced timed markers with Lua markers. Breaks save compatibility. KFEAT: feature names are now as in the dungeon_feature_type enum. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1930 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/tags.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/tags.cc') diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index 5748975294..cc0e1648d9 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -374,7 +374,7 @@ void marshallString(struct tagHeader &th, const std::string &data, int maxSize) } // string -- unmarshall length & string data -void unmarshallCString(struct tagHeader &th, char *data, int maxSize) +int unmarshallCString(struct tagHeader &th, char *data, int maxSize) { // get length short len = unmarshallShort(th); @@ -388,6 +388,8 @@ void unmarshallCString(struct tagHeader &th, char *data, int maxSize) data[copylen] = 0; th.offset += len; + + return (copylen); } std::string unmarshallString(tagHeader &th, int maxSize) @@ -398,10 +400,9 @@ std::string unmarshallString(tagHeader &th, int maxSize) if (!buffer) return (""); *buffer = 0; - unmarshallCString(th, buffer, maxSize); - const std::string res = buffer; + const int slen = unmarshallCString(th, buffer, maxSize); + const std::string res(buffer, slen); delete [] buffer; - return (res); } -- cgit v1.2.3-54-g00ecf