summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-28 15:46:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-28 16:41:19 +0300
commitf146cd42ce84a08879eb286ecd2ed2aa8ad82300 (patch)
treef689f832f54f361be8cff61deb47c0e32febd486 /src/net
parent409cee51fe11e2495a2741226432666a8702dceb (diff)
downloadmv-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.tar.gz
mv-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.tar.bz2
mv-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.tar.xz
mv-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.zip
fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/inventoryhandler.cpp4
-rw-r--r--src/net/ea/inventoryhandler.h4
-rw-r--r--src/net/ea/partyhandler.cpp2
-rw-r--r--src/net/ea/partyhandler.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index d64050e1a..2262a79f9 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -152,7 +152,7 @@ int InventoryHandler::convertFromServerSlot(const int serverSlot) const
return EQUIP_CONVERT[serverSlot];
}
-int InventoryHandler::getSlot(const int eAthenaSlot) const
+int InventoryHandler::getSlot(const int eAthenaSlot)
{
if (eAthenaSlot == 0)
return Equipment::EQUIP_VECTOREND;
@@ -566,7 +566,7 @@ void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
miniStatusWindow->updateArrows();
}
-void InventoryHandler::processPlayerAttackRange(Net::MessageIn &msg) const
+void InventoryHandler::processPlayerAttackRange(Net::MessageIn &msg)
{
const int range = msg.readInt16();
if (player_node)
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 494b9145a..ac88c1d6c 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -175,7 +175,7 @@ class InventoryHandler : public Net::InventoryHandler
void pushPickup(const int floorId)
{ mSentPickups.push(floorId); }
- int getSlot(const int eAthenaSlot) const A_WARN_UNUSED;
+ static int getSlot(const int eAthenaSlot) A_WARN_UNUSED;
void processPlayerInventory(Net::MessageIn &msg,
const bool playerInvintory);
@@ -204,7 +204,7 @@ class InventoryHandler : public Net::InventoryHandler
void processPlayerUnEquip(Net::MessageIn &msg);
- void processPlayerAttackRange(Net::MessageIn &msg) const;
+ static void processPlayerAttackRange(Net::MessageIn &msg);
void processPlayerArrowEquip(Net::MessageIn &msg);
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 7f29f277a..4e4cac3df 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -60,7 +60,7 @@ void PartyHandler::join(const int partyId A_UNUSED) const
{
}
-void PartyHandler::reload() const
+void PartyHandler::reload()
{
taParty = Party::getParty(1);
}
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 29f242285..24923bd4a 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -52,7 +52,7 @@ class PartyHandler : public Net::PartyHandler
PartyShare getShareItems() const override final A_WARN_UNUSED
{ return mShareItems; }
- void reload() const;
+ static void reload();
void clear() const override final;