summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-24 22:03:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-25 10:45:54 +0300
commit67f8b40f80368dad17a9da50c78923433e266f54 (patch)
tree4667906e1ab807c31216f89da450b3cce5585150 /src/net
parent286f34b97b8a4fb56fde1f9e5f3a95ba0c807441 (diff)
downloadmv-67f8b40f80368dad17a9da50c78923433e266f54.tar.gz
mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.bz2
mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.xz
mv-67f8b40f80368dad17a9da50c78923433e266f54.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/partyhandler.h1
-rw-r--r--src/net/eathena/adminhandler.cpp4
-rw-r--r--src/net/eathena/chathandler.cpp3
-rw-r--r--src/net/eathena/inventoryhandler.cpp2
-rw-r--r--src/net/eathena/tradehandler.cpp2
-rw-r--r--src/net/eathena/tradehandler.h2
-rw-r--r--src/net/tmwa/adminhandler.cpp4
-rw-r--r--src/net/tmwa/generalhandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp12
9 files changed, 10 insertions, 22 deletions
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index d2c82cc95..c415ac4b5 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -25,7 +25,6 @@
#include "net/partyhandler.h"
class Party;
-class PartyTab;
namespace Net
{
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 124e09734..686048554 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -22,13 +22,9 @@
#include "net/eathena/adminhandler.h"
-#include "notifymanager.h"
-
#include "net/eathena/messageout.h"
#include "net/eathena/protocol.h"
-#include "resources/notifytypes.h"
-
#include <string>
#include "debug.h"
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index e7b8e66ec..50d4569dc 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -422,7 +422,8 @@ std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg)
return channel;
}
-void ChatHandler::processChatContinue(std::string chatMsg, ChatMsgType::Type own)
+void ChatHandler::processChatContinue(std::string chatMsg,
+ ChatMsgType::Type own)
{
const std::string channel = extractChannelFromMessage(chatMsg);
bool allow(true);
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index a7315c506..14fa4df3b 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -29,8 +29,6 @@
#include "listeners/arrowslistener.h"
-#include "net/serverfeatures.h"
-
#include "net/eathena/itemflags.h"
#include "net/eathena/menu.h"
#include "net/eathena/messageout.h"
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 3d76d9e78..ef08a5521 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -46,7 +46,7 @@ extern Net::TradeHandler *tradeHandler;
namespace EAthena
{
int TradeHandler::mQuantity = 0;
-uint16_t TradeHandler::mItemIndex = -1;
+int TradeHandler::mItemIndex = -1;
TradeHandler::TradeHandler() :
MessageHandler(),
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index 36336f002..ccfee1101 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -66,7 +66,7 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
static void processTradeItemAddResponse(Net::MessageIn &msg);
static int mQuantity;
- static uint16_t mItemIndex;
+ static int mItemIndex;
};
} // namespace EAthena
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index ce81c596c..08bf5f3a4 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -22,8 +22,6 @@
#include "net/tmwa/adminhandler.h"
-#include "notifymanager.h"
-
#include "gui/chatconsts.h"
#include "net/chathandler.h"
@@ -31,8 +29,6 @@
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
-#include "resources/notifytypes.h"
-
#include "utils/stringutils.h"
#include <string>
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index e2c609b2c..219cedc3d 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -33,8 +33,6 @@
#include "gui/windows/socialwindow.h"
#include "gui/windows/statuswindow.h"
-#include "net/ea/guildhandler.h"
-
#include "gui/widgets/tabs/chat/guildtab.h"
#include "gui/widgets/tabs/chat/partytab.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index dec66396e..43cc5fd3b 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -254,7 +254,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
const int index = msg.readInt16("index") - INVENTORY_OFFSET;
const int itemId = msg.readInt16("item id");
const uint8_t itemType = msg.readUInt8("item type");
- uint8_t identified = msg.readUInt8("identify");
+ const uint8_t identified = msg.readUInt8("identify");
msg.readInt16("equip type?");
const int equipType = msg.readInt16("equip type");
@@ -306,7 +306,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
const int index = msg.readInt16("index") - INVENTORY_OFFSET;
int amount = msg.readInt16("amount");
const int itemId = msg.readInt16("item id");
- uint8_t identified = msg.readUInt8("identified");
+ const uint8_t identified = msg.readUInt8("identified");
msg.readUInt8("attribute");
const uint8_t refine = msg.readUInt8("refine");
int cards[4];
@@ -416,7 +416,7 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
const int index = msg.readInt16("index") - INVENTORY_OFFSET;
const int itemId = msg.readInt16("item id");
const uint8_t itemType = msg.readUInt8("item type");
- uint8_t identified = msg.readUInt8("identified");
+ const uint8_t identified = msg.readUInt8("identified");
const int amount = msg.readInt16("amount");
const int arrow = msg.readInt16("arrow");
for (int i = 0; i < 4; i++)
@@ -465,7 +465,7 @@ void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
const int index = msg.readInt16("index") - STORAGE_OFFSET;
const int itemId = msg.readInt16("item id");
const uint8_t itemType = msg.readUInt8("item type");
- uint8_t identified = msg.readUInt8("identified");
+ const uint8_t identified = msg.readUInt8("identified");
const int amount = msg.readInt16("amount");
msg.readInt16("arrow");
for (int i = 0; i < 4; i++)
@@ -533,7 +533,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
const int index = msg.readInt16("index") - STORAGE_OFFSET;
const int itemId = msg.readInt16("item id");
const uint8_t itemType = msg.readUInt8("item type");
- uint8_t identified = msg.readUInt8("identified");
+ const uint8_t identified = msg.readUInt8("identified");
const int amount = 1;
msg.readInt16("equip point?");
msg.readInt16("another equip point?");
@@ -575,7 +575,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
const int index = msg.readInt16("index") - STORAGE_OFFSET;
const int amount = msg.readInt32("amount");
const int itemId = msg.readInt16("item id");
- unsigned char identified = msg.readUInt8("identified");
+ const unsigned char identified = msg.readUInt8("identified");
msg.readUInt8("attribute");
const uint8_t refine = msg.readUInt8("refine");
int cards[4];