summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-30 22:15:24 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-30 22:15:24 +0300
commitd70d41864853924a456595875b6811b74222dd7c (patch)
tree99485951528734a54cd2f8ad297e76860f7ba9d4 /src/net
parenta619290b502486ea5b1ff5dd604864ab78c5edc9 (diff)
downloadplus-d70d41864853924a456595875b6811b74222dd7c.tar.gz
plus-d70d41864853924a456595875b6811b74222dd7c.tar.bz2
plus-d70d41864853924a456595875b6811b74222dd7c.tar.xz
plus-d70d41864853924a456595875b6811b74222dd7c.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/inventoryhandler.h1
-rw-r--r--src/net/eathena/inventoryhandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp3
3 files changed, 3 insertions, 3 deletions
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index be9fb0e52..c8aadc514 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -23,7 +23,6 @@
#ifndef NET_EA_INVENTORYHANDLER_H
#define NET_EA_INVENTORYHANDLER_H
-#include "inventory.h"
#include "localconsts.h"
#include "net/inventoryhandler.h"
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 030925965..bcf5806a5 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -798,7 +798,7 @@ void InventoryHandler::processCartInfo(Net::MessageIn &msg)
void InventoryHandler::processCartRemove(Net::MessageIn &msg A_UNUSED)
{
- //+++ need close or clear cart?
+ // +++ need close or clear cart?
}
void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 7821d9aca..b0dcca900 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -223,7 +223,8 @@ void InventoryHandler::closeStorage(const int type A_UNUSED) const
void InventoryHandler::moveItem2(const int source, const int slot,
const int amount, const int destination) const
{
- if (source == InventoryType::INVENTORY && destination == InventoryType::STORAGE)
+ if (source == InventoryType::INVENTORY
+ && destination == InventoryType::STORAGE)
{
createOutPacket(CMSG_MOVE_TO_STORAGE);
outMsg.writeInt16(static_cast<int16_t>(slot + INVENTORY_OFFSET),