summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-11 17:13:54 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-11 17:13:54 +0300
commit333fa4263ce7278b723b57aca4a21be7fb15ca3d (patch)
tree4ef450fadb152cc170066e32a58918bbf2952c38 /src/net/eathena
parenta5bda75dae5facec9f920af28865aae4d46b545b (diff)
downloadmanaplus-333fa4263ce7278b723b57aca4a21be7fb15ca3d.tar.gz
manaplus-333fa4263ce7278b723b57aca4a21be7fb15ca3d.tar.bz2
manaplus-333fa4263ce7278b723b57aca4a21be7fb15ca3d.tar.xz
manaplus-333fa4263ce7278b723b57aca4a21be7fb15ca3d.zip
Fix code style.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/charserverrecv.cpp1
-rw-r--r--src/net/eathena/inventoryhandler.cpp2
-rw-r--r--src/net/eathena/playerrecv.cpp3
3 files changed, 2 insertions, 4 deletions
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 1939749b0..aed472207 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -33,6 +33,7 @@
#include "gui/widgets/createwidget.h"
#include "net/character.h"
+#include "net/charserverhandler.h"
#include "net/playerhandler.h"
#include "net/serverfeatures.h"
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 1b781c3be..b832c167e 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -129,7 +129,7 @@ void InventoryHandler::moveItem2(const int source,
const int amount,
const int destination) const
{
- int packet = 0;
+ int16_t packet = 0;
int offset = INVENTORY_OFFSET;
if (source == InventoryType::INVENTORY)
{
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 4dcfd98bd..d397a6577 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -23,7 +23,6 @@
#include "net/eathena/playerrecv.h"
#include "configuration.h"
-#include "game.h"
#include "notifymanager.h"
#include "being/beingflag.h"
@@ -41,8 +40,6 @@
#include "net/messagein.h"
-#include "resources/map/map.h"
-
#include "debug.h"
namespace EAthena