summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-13 14:29:00 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-13 14:29:00 +0300
commit71a596747c6f31c0cd010b6cc4522f8ed717d38b (patch)
treeb0b2049fed46a461b7d91160d67e419fe62314d4 /src
parenta327fbea2edc89d781307ec7c3279aaf3aa065b7 (diff)
downloadmanaplus-71a596747c6f31c0cd010b6cc4522f8ed717d38b.tar.gz
manaplus-71a596747c6f31c0cd010b6cc4522f8ed717d38b.tar.bz2
manaplus-71a596747c6f31c0cd010b6cc4522f8ed717d38b.tar.xz
manaplus-71a596747c6f31c0cd010b6cc4522f8ed717d38b.zip
Fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/inventory.cpp2
-rw-r--r--src/net/eathena/inventoryhandler.cpp1
-rw-r--r--src/net/eathena/searchstorehandler.cpp4
-rw-r--r--src/net/tmwa/inventoryhandler.cpp1
4 files changed, 2 insertions, 6 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 79816fae5..fea581446 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -25,8 +25,6 @@
#include "item.h"
#include "logger.h"
-#include "enums/simpletypes.h"
-
#include "net/inventoryhandler.h"
#include "resources/iteminfo.h"
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 9f22b34ff..30768e86f 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -25,7 +25,6 @@
#include "notifymanager.h"
#include "enums/equipslot.h"
-#include "enums/simpletypes.h"
#include "enums/being/attributes.h"
diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp
index ed23b1dda..1507cb92f 100644
--- a/src/net/eathena/searchstorehandler.cpp
+++ b/src/net/eathena/searchstorehandler.cpp
@@ -86,7 +86,7 @@ void SearchStoreHandler::search(const StoreSearchType::Type type,
outMsg.writeInt32(minPrice, "min price");
outMsg.writeInt32(1, "items count");
outMsg.writeInt32(0, "cards count");
- outMsg.writeInt16(itemId, "item id");
+ outMsg.writeInt16(static_cast<int16_t>(itemId), "item id");
}
void SearchStoreHandler::nextPage() const
@@ -106,7 +106,7 @@ void SearchStoreHandler::select(const int accountId,
createOutPacket(CMSG_SEARCHSTORE_CLICK);
outMsg.writeInt32(accountId, "account id");
outMsg.writeInt32(storeId, "store id");
- outMsg.writeInt16(itemId, "item id");
+ outMsg.writeInt16(static_cast<int16_t>(itemId), "item id");
}
void SearchStoreHandler::processSearchAck(Net::MessageIn &msg)
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index ea8a912b7..962eed43c 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -25,7 +25,6 @@
#include "notifymanager.h"
#include "enums/equipslot.h"
-#include "enums/simpletypes.h"
#include "being/localplayer.h"