From 30f64ba7f1f7a1d76f2dbddc05fe1d123de9c86d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 25 Sep 2015 20:17:57 +0300
Subject: Fix code style.
---
src/actions/target.cpp | 2 --
src/net/eathena/inventoryhandler.cpp | 2 +-
src/net/eathena/protocolout.h | 2 +-
src/net/eathena/updateprotocol.cpp | 2 --
src/net/eathena/updateprotocol.h | 2 +-
src/net/messageout.h | 2 +-
src/net/tmwa/updateprotocol.cpp | 2 +-
7 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/actions/target.cpp b/src/actions/target.cpp
index a0615143c..34c4c99c0 100644
--- a/src/actions/target.cpp
+++ b/src/actions/target.cpp
@@ -20,8 +20,6 @@
#include "actions/target.h"
-#include "actormanager.h"
-
#include "actions/actiondef.h"
#include "being/localplayer.h"
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index b832c167e..1b781c3be 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
{
- int16_t packet = 0;
+ int packet = 0;
int offset = INVENTORY_OFFSET;
if (source == InventoryType::INVENTORY)
{
diff --git a/src/net/eathena/protocolout.h b/src/net/eathena/protocolout.h
index 571edfccf..502beede5 100644
--- a/src/net/eathena/protocolout.h
+++ b/src/net/eathena/protocolout.h
@@ -26,7 +26,7 @@
namespace EAthena
{
#include "net/eathena/packetsout.inc"
-} // namespace Eathena
+} // namespace EAthena
#undef packet
#undef packet2
diff --git a/src/net/eathena/updateprotocol.cpp b/src/net/eathena/updateprotocol.cpp
index 1d704adfe..34b8713c5 100644
--- a/src/net/eathena/updateprotocol.cpp
+++ b/src/net/eathena/updateprotocol.cpp
@@ -20,8 +20,6 @@
#include "net/eathena/updateprotocol.h"
-#include "logger.h"
-
#include "net/eathena/network.h"
#include "net/eathena/protocolout.h"
diff --git a/src/net/eathena/updateprotocol.h b/src/net/eathena/updateprotocol.h
index e2d4e585f..d60af6985 100644
--- a/src/net/eathena/updateprotocol.h
+++ b/src/net/eathena/updateprotocol.h
@@ -24,6 +24,6 @@
namespace EAthena
{
void updateProtocol();
-} // namespace Eathena
+} // namespace EAthena
#endif // NET_EATHENA_UPDATEPROTOCOL_H
diff --git a/src/net/messageout.h b/src/net/messageout.h
index fb48ddd6e..39b826dfe 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -30,7 +30,7 @@
#include "localconsts.h"
#define createOutPacket(name) MessageOut outMsg(name); \
- outMsg.writeInt16(name, #name)
+ outMsg.writeInt16(static_cast<int16_t>(name), #name)
namespace Net
{
diff --git a/src/net/tmwa/updateprotocol.cpp b/src/net/tmwa/updateprotocol.cpp
index 391d01a63..279c2df5a 100644
--- a/src/net/tmwa/updateprotocol.cpp
+++ b/src/net/tmwa/updateprotocol.cpp
@@ -42,4 +42,4 @@ void updateProtocol()
}
}
-} // namesspace TmwAthena
+} // namespace TmwAthena
--
cgit v1.2.3-70-g09d2