diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-15 15:26:57 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-15 15:26:57 +0000 |
commit | cc137f4b229d1763c3ad71fe56605b8611a1067c (patch) | |
tree | 601f5b148db6c1d94d593d89a11208ae3fa925ad /crawl-ref/source/tags.cc | |
parent | 8b6107e382417e437cc541dfad85c20234ca3d7c (diff) | |
download | crawl-ref-cc137f4b229d1763c3ad71fe56605b8611a1067c.tar.gz crawl-ref-cc137f4b229d1763c3ad71fe56605b8611a1067c.zip |
Another code cleanup.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4244 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tags.cc')
-rw-r--r-- | crawl-ref/source/tags.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index 736fb7ce90..a3b05febff 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -129,9 +129,8 @@ void writer::writeByte(unsigned char ch) { if (_file) fputc(ch, _file); - else { + else _pbuf->push_back(ch); - } } void writer::write(const void *data, size_t size) @@ -226,7 +225,7 @@ char unmarshallByte(reader &th) void marshallShort(std::vector<unsigned char>& buf, short data) { - COMPILE_CHECK(sizeof(data)==2, c1); + COMPILE_CHECK(sizeof(data) == 2, c1); buf.push_back((unsigned char) ((data & 0xFF00) >> 8)); buf.push_back((unsigned char) ((data & 0x00FF) )); } @@ -785,13 +784,13 @@ void tag_set_expected(char tags[], int fileType) { int i; - for (i=0; i<NUM_TAGS; i++) + for (i = 0; i < NUM_TAGS; i++) { tags[i] = -1; switch(fileType) { case TAGTYPE_PLAYER: - if ((i >= TAG_YOU && i <=TAG_YOU_DUNGEON) + if (i >= TAG_YOU && i <= TAG_YOU_DUNGEON || i == TAG_LOST_MONSTERS) { tags[i] = 1; |