summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-12 17:33:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-12 17:33:51 +0300
commit37969cb5a1892a05abc84f087213c9903c2c654e (patch)
tree52835ded960d26e227a5ec3f7690c092a6b8a2d5 /src/net
parentc98d192af4daa48a4c27cfa3225e22e89f329525 (diff)
downloadmanaverse-37969cb5a1892a05abc84f087213c9903c2c654e.tar.gz
manaverse-37969cb5a1892a05abc84f087213c9903c2c654e.tar.bz2
manaverse-37969cb5a1892a05abc84f087213c9903c2c654e.tar.xz
manaverse-37969cb5a1892a05abc84f087213c9903c2c654e.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/serverinfo.h3
-rw-r--r--src/net/tmwa/buyingstorehandler.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 7df9e0066..efbdf015a 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -89,7 +89,7 @@ class ServerInfo final
version.second = info.version.second;
}
- void operator=(const ServerInfo &info)
+ ServerInfo &operator=(const ServerInfo &info)
{
type = info.type;
name = info.name;
@@ -105,6 +105,7 @@ class ServerInfo final
persistentIp = info.persistentIp;
version.first = info.version.first;
version.second = info.version.second;
+ return *this;
}
bool isValid() const A_WARN_UNUSED
diff --git a/src/net/tmwa/buyingstorehandler.cpp b/src/net/tmwa/buyingstorehandler.cpp
index 882206761..c31bf5989 100644
--- a/src/net/tmwa/buyingstorehandler.cpp
+++ b/src/net/tmwa/buyingstorehandler.cpp
@@ -35,7 +35,8 @@ BuyingStoreHandler::BuyingStoreHandler()
void BuyingStoreHandler::create(const std::string &name A_UNUSED,
const int maxMoney A_UNUSED,
const bool flag A_UNUSED,
- const std::vector<ShopItem*> &items A_UNUSED) const
+ const std::vector<ShopItem*> &items A_UNUSED)
+ const
{
}