summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/store.h
diff options
context:
space:
mode:
authorpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-17 05:54:42 +0000
committerpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-17 05:54:42 +0000
commit8ba172496400cc74a2fa7d343d9859339f1a0f5d (patch)
tree09715fca1c835aca87d0da9d629ad5f9e0157e54 /crawl-ref/source/store.h
parent314a2c0efb7083bc9703b6e2f6ee4e054d000cc1 (diff)
downloadcrawl-ref-8ba172496400cc74a2fa7d343d9859339f1a0f5d.tar.gz
crawl-ref-8ba172496400cc74a2fa7d343d9859339f1a0f5d.zip
Cleanup/refactoring of tags.cc. No functional changes. I've been
running with and without this patch applied for about a week, and none of my saves have broken, so I'm ready to commit it. - Tag system no longer uses one big (shared!) global buffer. This was the original impetus behind the change... - Change every use of tagHeader into reader or writer (touches a lot). - Split tagHeader into two classes: reader and writer. Turns out every place that used tagHeader only cared about reading or writing and not about tags at all. There was nothing left in tagHeader, so it disappeared along with a bunch of grotty special-case code. - Not done: merge the files.cc read/writeThing code with the tags.cc marshall/unmarshallThing code. This patch is big enough already. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3685 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/store.h')
-rw-r--r--crawl-ref/source/store.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/store.h b/crawl-ref/source/store.h
index 727892cd02..a7e49043d7 100644
--- a/crawl-ref/source/store.h
+++ b/crawl-ref/source/store.h
@@ -19,7 +19,8 @@
#include <string>
#include <vector>
-struct tagHeader;
+class reader;
+class writer;
class CrawlHashTable;
class CrawlVector;
struct item_def;
@@ -228,8 +229,8 @@ protected:
CrawlStoreValue(const store_flags flags,
const store_val_type type = SV_NONE);
- void write(tagHeader &th) const;
- void read(tagHeader &th);
+ void write(writer &) const;
+ void read(reader &);
void unset(bool force = false);
@@ -271,8 +272,8 @@ protected:
friend class CrawlStoreValue;
public:
- void write(tagHeader &th) const;
- void read(tagHeader &th);
+ void write(writer &) const;
+ void read(reader &);
store_flags get_default_flags() const;
store_flags set_default_flags(store_flags flags);
@@ -337,8 +338,8 @@ protected:
friend class CrawlStoreValue;
public:
- void write(tagHeader &th) const;
- void read(tagHeader &th);
+ void write(writer &) const;
+ void read(reader &);
store_flags get_default_flags() const;
store_flags set_default_flags(store_flags flags);