summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/store.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-07-05 13:22:39 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-07-05 14:00:11 +0200
commit68935e461e64eeb85ea44c616d1eab58975b8e20 (patch)
tree471804168af54b681856211f26fefb5091b34c34 /crawl-ref/source/store.cc
parent15d548d4ba1148531b8d755d4130962126bccb52 (diff)
downloadcrawl-ref-68935e461e64eeb85ea44c616d1eab58975b8e20.tar.gz
crawl-ref-68935e461e64eeb85ea44c616d1eab58975b8e20.zip
Some more return deparenthesization.
Diffstat (limited to 'crawl-ref/source/store.cc')
-rw-r--r--crawl-ref/source/store.cc42
1 files changed, 21 insertions, 21 deletions
diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc
index 5d9f769853..1896e17521 100644
--- a/crawl-ref/source/store.cc
+++ b/crawl-ref/source/store.cc
@@ -451,7 +451,7 @@ CrawlStoreValue &CrawlStoreValue::operator = (const CrawlStoreValue &other)
break;
}
- return (*this);
+ return *this;
}
///////////////////////////////////
@@ -1076,97 +1076,97 @@ CrawlStoreValue::operator level_pos() const
CrawlStoreValue &CrawlStoreValue::operator = (const bool &_val)
{
get_bool() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const char &_val)
{
get_byte() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const short &_val)
{
get_short() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const int &_val)
{
get_int() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const int64_t &_val)
{
get_int64() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const float &_val)
{
get_float() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const std::string &_val)
{
get_string() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const char* _val)
{
get_string() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const coord_def &_val)
{
get_coord() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const CrawlHashTable &_val)
{
get_table() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const CrawlVector &_val)
{
get_vector() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const item_def &_val)
{
get_item() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const level_id &_val)
{
get_level_id() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const level_pos &_val)
{
get_level_pos() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const monster& _val)
{
get_monster() = _val;
- return (*this);
+ return *this;
}
CrawlStoreValue &CrawlStoreValue::operator = (const dlua_chunk &_val)
{
get_lua() = _val;
- return (*this);
+ return *this;
}
///////////////////////////////////////////////////
@@ -1270,12 +1270,12 @@ CrawlHashTable &CrawlHashTable::operator = (const CrawlHashTable &other)
if (other.hash_map == NULL)
{
hash_map = NULL;
- return (*this);
+ return *this;
}
hash_map = new hash_map_type(*(other.hash_map));
- return (*this);
+ return *this;
}
//////////////////////////////
@@ -1433,7 +1433,7 @@ CrawlStoreValue& CrawlHashTable::get_value(const std::string &key)
return val;
}
- return (i->second);
+ return i->second;
}
const CrawlStoreValue& CrawlHashTable::get_value(const std::string &key) const
@@ -1454,7 +1454,7 @@ const CrawlStoreValue& CrawlHashTable::get_value(const std::string &key) const
ASSERT(i->second.type != SV_NONE);
ASSERT(!(i->second.flags & SFLAG_UNSET));
- return (i->second);
+ return i->second;
}
///////////////////////////