summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-09 20:30:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-09 20:30:47 +0300
commit407de0a8d0898b28a587962e997df816cb17b6a9 (patch)
tree99a0184bb44950a900a9f093afb8887bdd148548 /src/net/eathena
parent972fdcbd1ed61e2528c8b4c733f21a70d7f674b1 (diff)
downloadmv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.gz
mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.bz2
mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.xz
mv-407de0a8d0898b28a587962e997df816cb17b6a9.zip
Fix code style.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/adminhandler.cpp2
-rw-r--r--src/net/eathena/auctionhandler.cpp2
-rw-r--r--src/net/eathena/battlegroundhandler.cpp1
-rw-r--r--src/net/eathena/beinghandler.cpp1
-rw-r--r--src/net/eathena/buyingstorehandler.cpp1
-rw-r--r--src/net/eathena/buysellhandler.cpp1
-rw-r--r--src/net/eathena/cashshophandler.cpp1
-rw-r--r--src/net/eathena/charserverhandler.cpp1
-rw-r--r--src/net/eathena/charserverrecv.cpp2
-rw-r--r--src/net/eathena/chathandler.cpp1
-rw-r--r--src/net/eathena/elementalhandler.cpp2
-rw-r--r--src/net/eathena/gamehandler.cpp1
-rw-r--r--src/net/eathena/generalhandler.cpp2
-rw-r--r--src/net/eathena/guildhandler.cpp1
-rw-r--r--src/net/eathena/homunculushandler.cpp1
-rw-r--r--src/net/eathena/inventoryhandler.cpp1
-rw-r--r--src/net/eathena/loginhandler.cpp2
-rw-r--r--src/net/eathena/loginrecv.cpp2
-rw-r--r--src/net/eathena/mailhandler.cpp2
-rw-r--r--src/net/eathena/maphandler.cpp2
-rw-r--r--src/net/eathena/mercenaryhandler.cpp2
-rw-r--r--src/net/eathena/npchandler.cpp1
-rw-r--r--src/net/eathena/partyhandler.cpp1
-rw-r--r--src/net/eathena/pethandler.cpp2
-rw-r--r--src/net/eathena/playerhandler.cpp1
-rw-r--r--src/net/eathena/roulettehandler.cpp2
-rw-r--r--src/net/eathena/searchstorehandler.cpp1
27 files changed, 1 insertions, 38 deletions
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 8a88f15d4..87ab97fec 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -32,8 +32,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index ddae97485..24c09f16a 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -29,8 +29,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/battlegroundhandler.cpp b/src/net/eathena/battlegroundhandler.cpp
index 961e3781e..606b90cc1 100644
--- a/src/net/eathena/battlegroundhandler.cpp
+++ b/src/net/eathena/battlegroundhandler.cpp
@@ -25,7 +25,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 80a62e38e..d87b37b3d 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -28,7 +28,6 @@
#include "debug.h"
-
extern int packetVersion;
extern int serverVersion;
diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp
index 518e1bfaa..32ec084c9 100644
--- a/src/net/eathena/buyingstorehandler.cpp
+++ b/src/net/eathena/buyingstorehandler.cpp
@@ -32,7 +32,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 3bf349cc0..19d555ff3 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -29,7 +29,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp
index 9928c1a94..40af5324e 100644
--- a/src/net/eathena/cashshophandler.cpp
+++ b/src/net/eathena/cashshophandler.cpp
@@ -28,7 +28,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 219961ba7..a184abd07 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -37,7 +37,6 @@
#include "debug.h"
-
extern int packetVersion;
extern int serverVersion;
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index f11a84efa..44c90a227 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -54,10 +54,8 @@
#include "debug.h"
-
extern int packetVersion;
-
namespace EAthena
{
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index cf40d215d..0b630ee63 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -38,7 +38,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/elementalhandler.cpp b/src/net/eathena/elementalhandler.cpp
index 4bdc8beb1..cc27fc39b 100644
--- a/src/net/eathena/elementalhandler.cpp
+++ b/src/net/eathena/elementalhandler.cpp
@@ -22,8 +22,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index c80a11cd3..ca7fdf81a 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -39,7 +39,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index a5c14c67f..71187cac7 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -72,8 +72,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 83182f0b2..178a628fc 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -38,7 +38,6 @@
GuildTab *guildTab = nullptr;
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp
index 832ddb3be..482d29bce 100644
--- a/src/net/eathena/homunculushandler.cpp
+++ b/src/net/eathena/homunculushandler.cpp
@@ -29,7 +29,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index ae4c68b89..7044b1611 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -35,7 +35,6 @@
#include "debug.h"
-
extern int packetVersion;
// this conversion from bit corrupted LOOK_* to EquipSlot
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 78d5d54ff..1c8e25e69 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -35,8 +35,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 92de540da..13818c9cf 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -260,7 +260,7 @@ void LoginRecv::processLoginData(Net::MessageIn &msg)
msg.readInt16("new");
if (msg.getVersion() >= 20170315)
{
- for(int f = 0; f < 32; f ++)
+ for (int f = 0; f < 32; f ++)
msg.readUInt8("unused2");
}
diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp
index f00497def..4ecbfdda4 100644
--- a/src/net/eathena/mailhandler.cpp
+++ b/src/net/eathena/mailhandler.cpp
@@ -27,8 +27,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp
index c8d65509b..042f87778 100644
--- a/src/net/eathena/maphandler.cpp
+++ b/src/net/eathena/maphandler.cpp
@@ -22,8 +22,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
index 56e458a1c..0159a5cbd 100644
--- a/src/net/eathena/mercenaryhandler.cpp
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -29,8 +29,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 0790cbfcf..38a54a6fd 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -43,7 +43,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 231aa61f9..7f59ec4db 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -37,7 +37,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena
diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp
index b4a88c027..043acbedc 100644
--- a/src/net/eathena/pethandler.cpp
+++ b/src/net/eathena/pethandler.cpp
@@ -29,8 +29,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 86274c272..02c56c869 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -44,7 +44,6 @@
#include "debug.h"
-
extern int packetVersion;
extern int serverVersion;
diff --git a/src/net/eathena/roulettehandler.cpp b/src/net/eathena/roulettehandler.cpp
index 2f9b52205..6e107af38 100644
--- a/src/net/eathena/roulettehandler.cpp
+++ b/src/net/eathena/roulettehandler.cpp
@@ -22,8 +22,6 @@
#include "debug.h"
-
-
namespace EAthena
{
diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp
index b39577d3c..d9b4625cc 100644
--- a/src/net/eathena/searchstorehandler.cpp
+++ b/src/net/eathena/searchstorehandler.cpp
@@ -25,7 +25,6 @@
#include "debug.h"
-
extern int packetVersion;
namespace EAthena