summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/store.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2014-01-09 22:46:14 +0100
committerAdam Borowski <kilobyte@angband.pl>2014-01-10 01:27:07 +0100
commit08cb1a4dcf80dd9784e1cfd26729a000c13fe767 (patch)
tree1bac450446aa22ba68f871d3c239694929d1b24f /crawl-ref/source/store.cc
parenta735ae8250517f301fbf828a4f4cbc4924df3adb (diff)
downloadcrawl-ref-08cb1a4dcf80dd9784e1cfd26729a000c13fe767.tar.gz
crawl-ref-08cb1a4dcf80dd9784e1cfd26729a000c13fe767.zip
Drop some useless parentheses around comparisons.
Diffstat (limited to 'crawl-ref/source/store.cc')
-rw-r--r--crawl-ref/source/store.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc
index f44b21755e..9abb559fa7 100644
--- a/crawl-ref/source/store.cc
+++ b/crawl-ref/source/store.cc
@@ -483,7 +483,7 @@ store_val_type CrawlStoreValue::get_type() const
void CrawlStoreValue::write(writer &th) const
{
ASSERT(type != SV_NONE || (flags & SFLAG_UNSET));
- ASSERT(!(flags & SFLAG_UNSET) || (type == SV_NONE));
+ ASSERT(!(flags & SFLAG_UNSET) || type == SV_NONE);
marshallByte(th, (char) type);
marshallByte(th, (char) flags);
@@ -591,7 +591,7 @@ void CrawlStoreValue::read(reader &th)
flags = (store_flags) unmarshallByte(th);
ASSERT(type != SV_NONE || (flags & SFLAG_UNSET));
- ASSERT(!(flags & SFLAG_UNSET) || (type == SV_NONE));
+ ASSERT(!(flags & SFLAG_UNSET) || type == SV_NONE);
switch (type)
{
@@ -1845,7 +1845,7 @@ void CrawlVector::push_back(CrawlStoreValue val)
ASSERT(vec.size() < max_size);
ASSERT(type == SV_NONE
|| (val.type == SV_NONE && (val.flags & SFLAG_UNSET))
- || (val.type == type));
+ || val.type == type);
val.flags |= default_flags;
if (type != SV_NONE)
{
@@ -1862,7 +1862,7 @@ void CrawlVector::insert(const vec_size index, CrawlStoreValue val)
ASSERT(vec.size() < max_size);
ASSERT(type == SV_NONE
|| (val.type == SV_NONE && (val.flags & SFLAG_UNSET))
- || (val.type == type));
+ || val.type == type);
val.flags |= default_flags;
if (type != SV_NONE)
{