diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-24 22:03:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-25 10:45:54 +0300 |
commit | 67f8b40f80368dad17a9da50c78923433e266f54 (patch) | |
tree | 4667906e1ab807c31216f89da450b3cce5585150 /src/net/tmwa | |
parent | 286f34b97b8a4fb56fde1f9e5f3a95ba0c807441 (diff) | |
download | manaverse-67f8b40f80368dad17a9da50c78923433e266f54.tar.gz manaverse-67f8b40f80368dad17a9da50c78923433e266f54.tar.bz2 manaverse-67f8b40f80368dad17a9da50c78923433e266f54.tar.xz manaverse-67f8b40f80368dad17a9da50c78923433e266f54.zip |
Fix code style.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/adminhandler.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 12 |
3 files changed, 6 insertions, 12 deletions
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]; |