diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-09 20:30:47 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-09 20:30:47 +0300 |
commit | 407de0a8d0898b28a587962e997df816cb17b6a9 (patch) | |
tree | 99a0184bb44950a900a9f093afb8887bdd148548 /src/net | |
parent | 972fdcbd1ed61e2528c8b4c733f21a70d7f674b1 (diff) | |
download | mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.gz mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.bz2 mv-407de0a8d0898b28a587962e997df816cb17b6a9.tar.xz mv-407de0a8d0898b28a587962e997df816cb17b6a9.zip |
Fix code style.
Diffstat (limited to 'src/net')
62 files changed, 1 insertions, 105 deletions
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index a64d70a46..d0703e501 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -31,8 +31,6 @@ #include "debug.h" - - namespace Ea { 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 diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 1be501c66..cd6583520 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -32,8 +32,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/auctionhandler.cpp b/src/net/tmwa/auctionhandler.cpp index 4f7932410..d1538c1db 100644 --- a/src/net/tmwa/auctionhandler.cpp +++ b/src/net/tmwa/auctionhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/bankhandler.cpp b/src/net/tmwa/bankhandler.cpp index d1c78c35f..521eb6d4c 100644 --- a/src/net/tmwa/bankhandler.cpp +++ b/src/net/tmwa/bankhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/battlegroundhandler.cpp b/src/net/tmwa/battlegroundhandler.cpp index 64d0b95bb..ecb80f177 100644 --- a/src/net/tmwa/battlegroundhandler.cpp +++ b/src/net/tmwa/battlegroundhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index c0729b505..da0b18fbf 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -28,8 +28,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/buyingstorehandler.cpp b/src/net/tmwa/buyingstorehandler.cpp index 156d6c72c..53fe39fa7 100644 --- a/src/net/tmwa/buyingstorehandler.cpp +++ b/src/net/tmwa/buyingstorehandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 221191056..e343614bd 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -35,8 +35,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/cashshophandler.cpp b/src/net/tmwa/cashshophandler.cpp index 912dfb0b5..0c2315560 100644 --- a/src/net/tmwa/cashshophandler.cpp +++ b/src/net/tmwa/cashshophandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 39dc852d5..200d09703 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -39,8 +39,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 95cf04f26..0130960e0 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -52,8 +52,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 4a1741a12..1b706495f 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -36,7 +36,6 @@ #include "debug.h" - extern unsigned int tmwServerVersion; namespace TmwAthena diff --git a/src/net/tmwa/elementalhandler.cpp b/src/net/tmwa/elementalhandler.cpp index b19ba62c8..bf9caae25 100644 --- a/src/net/tmwa/elementalhandler.cpp +++ b/src/net/tmwa/elementalhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/familyhandler.cpp b/src/net/tmwa/familyhandler.cpp index 15648cfc8..b347e9880 100644 --- a/src/net/tmwa/familyhandler.cpp +++ b/src/net/tmwa/familyhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/friendshandler.cpp b/src/net/tmwa/friendshandler.cpp index 8b5f2d298..99f99c576 100644 --- a/src/net/tmwa/friendshandler.cpp +++ b/src/net/tmwa/friendshandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index e3baec5fd..2fec57df3 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -37,8 +37,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 736f8d859..577d384b7 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -72,8 +72,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 2c557f1a1..926d15d59 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -23,8 +23,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/homunculushandler.cpp b/src/net/tmwa/homunculushandler.cpp index 2ba8ed91e..320e43b7d 100644 --- a/src/net/tmwa/homunculushandler.cpp +++ b/src/net/tmwa/homunculushandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 65d0019f6..cf4c2f269 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -33,8 +33,6 @@ #include "debug.h" - - // missing EQUIP_RING1_SLOT const EquipSlot::Type EQUIP_CONVERT[] = { diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 22ea04859..ea57a6f5a 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -32,7 +32,6 @@ #include "debug.h" - extern unsigned int tmwServerVersion; namespace TmwAthena diff --git a/src/net/tmwa/mailhandler.cpp b/src/net/tmwa/mailhandler.cpp index 84b60d63b..c339fd067 100644 --- a/src/net/tmwa/mailhandler.cpp +++ b/src/net/tmwa/mailhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp index ba169c285..277cf8e9c 100644 --- a/src/net/tmwa/maphandler.cpp +++ b/src/net/tmwa/maphandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/markethandler.cpp b/src/net/tmwa/markethandler.cpp index c7733a578..7f58df4bc 100644 --- a/src/net/tmwa/markethandler.cpp +++ b/src/net/tmwa/markethandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/mercenaryhandler.cpp b/src/net/tmwa/mercenaryhandler.cpp index ce0344b17..9e1b58c50 100644 --- a/src/net/tmwa/mercenaryhandler.cpp +++ b/src/net/tmwa/mercenaryhandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 7eefe800f..e58ca4d69 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -39,8 +39,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 59b8f8db2..64bebcde7 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -36,8 +36,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp index c8eb797d1..adb82f16f 100644 --- a/src/net/tmwa/pethandler.cpp +++ b/src/net/tmwa/pethandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 5240396e9..0bfe06fd2 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -44,8 +44,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/roulettehandler.cpp b/src/net/tmwa/roulettehandler.cpp index c811b4adc..33e16b870 100644 --- a/src/net/tmwa/roulettehandler.cpp +++ b/src/net/tmwa/roulettehandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/searchstorehandler.cpp b/src/net/tmwa/searchstorehandler.cpp index 5a57a3634..54de0cc63 100644 --- a/src/net/tmwa/searchstorehandler.cpp +++ b/src/net/tmwa/searchstorehandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 1cdbc77e0..5af454314 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -24,7 +24,6 @@ extern unsigned int tmwServerVersion; - namespace TmwAthena { diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index 4fe1022c3..47d08ac62 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -27,8 +27,6 @@ #include "debug.h" - - namespace TmwAthena { diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 242817872..10273c7a7 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -33,8 +33,6 @@ #include "debug.h" - - extern std::string tradePartnerName; namespace TmwAthena diff --git a/src/net/tmwa/vendinghandler.cpp b/src/net/tmwa/vendinghandler.cpp index c6d760e4a..6742b762c 100644 --- a/src/net/tmwa/vendinghandler.cpp +++ b/src/net/tmwa/vendinghandler.cpp @@ -22,8 +22,6 @@ #include "debug.h" - - namespace TmwAthena { |