diff options
author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-17 05:54:42 +0000 |
---|---|---|
committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-17 05:54:42 +0000 |
commit | 8ba172496400cc74a2fa7d343d9859339f1a0f5d (patch) | |
tree | 09715fca1c835aca87d0da9d629ad5f9e0157e54 /crawl-ref/source/store.cc | |
parent | 314a2c0efb7083bc9703b6e2f6ee4e054d000cc1 (diff) | |
download | crawl-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.cc')
-rw-r--r-- | crawl-ref/source/store.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc index ecd55b619f..6feed39058 100644 --- a/crawl-ref/source/store.cc +++ b/crawl-ref/source/store.cc @@ -351,7 +351,7 @@ store_val_type CrawlStoreValue::get_type() const ////////////////////////////// // Read/write from/to savefile -void CrawlStoreValue::write(tagHeader &th) const +void CrawlStoreValue::write(writer &th) const { ASSERT(!(flags & SFLAG_UNSET)); @@ -423,7 +423,7 @@ void CrawlStoreValue::write(tagHeader &th) const } } -void CrawlStoreValue::read(tagHeader &th) +void CrawlStoreValue::read(reader &th) { type = static_cast<store_val_type>(unmarshallByte(th)); flags = (store_flags) unmarshallByte(th); @@ -1038,7 +1038,7 @@ CrawlHashTable::~CrawlHashTable() ////////////////////////////// // Read/write from/to savefile -void CrawlHashTable::write(tagHeader &th) const +void CrawlHashTable::write(writer &th) const { assert_validity(); if (empty()) @@ -1062,7 +1062,7 @@ void CrawlHashTable::write(tagHeader &th) const assert_validity(); } -void CrawlHashTable::read(tagHeader &th) +void CrawlHashTable::read(reader &th) { assert_validity(); @@ -1327,7 +1327,7 @@ CrawlVector::~CrawlVector() ////////////////////////////// // Read/write from/to savefile -void CrawlVector::write(tagHeader &th) const +void CrawlVector::write(writer &th) const { assert_validity(); if (empty()) @@ -1352,7 +1352,7 @@ void CrawlVector::write(tagHeader &th) const assert_validity(); } -void CrawlVector::read(tagHeader &th) +void CrawlVector::read(reader &th) { assert_validity(); |