From adb67cb947885af8f74eb8ad943d2862a198805d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 13 Mar 2015 17:12:06 +0300 Subject: fix code style. --- src/net/eathena/beinghandler.cpp | 1 - src/net/eathena/gamehandler.cpp | 2 +- src/net/eathena/inventoryhandler.cpp | 2 +- src/net/eathena/loginhandler.cpp | 2 +- src/net/eathena/maphandler.h | 1 - src/net/eathena/maptypeproperty2.h | 31 +++++++++++++++++++------------ src/net/eathena/skillhandler.cpp | 2 +- src/net/eathena/tradehandler.cpp | 2 +- src/net/maphandler.h | 2 +- src/net/tmwa/generalhandler.cpp | 29 ++++++++++++++++------------- src/net/tmwa/maphandler.cpp | 12 ------------ src/net/tmwa/maphandler.h | 1 - 12 files changed, 41 insertions(+), 46 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index aaac021ab..39ab454a1 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -25,7 +25,6 @@ #include "actormanager.h" #include "effectmanager.h" #include "game.h" -#include "guildmanager.h" #include "being/localplayer.h" #include "being/mercenaryinfo.h" diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 1a2e312b5..4848946ce 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -210,7 +210,7 @@ void GameHandler::processMapLogin(Net::MessageIn &msg) void GameHandler::processServerTick(Net::MessageIn &msg) { - //ignoring + // ignoring msg.readInt32("tick"); } diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 63799f8db..820f9f71a 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -868,7 +868,7 @@ void InventoryHandler::processCartInfo(Net::MessageIn &msg) mCartItems.clear(); } -void InventoryHandler::processCartRemove(Net::MessageIn &msg A_UNUSED) +void InventoryHandler::processCartRemove(Net::MessageIn &msg) { UNIMPLIMENTEDPACKET; // +++ need close or clear cart? diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index c7cee6b2e..8a02635b0 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -241,7 +241,7 @@ void LoginHandler::processLoginError2(Net::MessageIn &msg) client->setState(STATE_ERROR); } -void LoginHandler::processUpdateHost2(Net::MessageIn &msg A_UNUSED) +void LoginHandler::processUpdateHost2(Net::MessageIn &msg) { UNIMPLIMENTEDPACKET; } diff --git a/src/net/eathena/maphandler.h b/src/net/eathena/maphandler.h index 9b5499bf3..9c54ece6d 100644 --- a/src/net/eathena/maphandler.h +++ b/src/net/eathena/maphandler.h @@ -27,7 +27,6 @@ namespace EAthena { -class MessageOut; class MapHandler final : public MessageHandler, public Net::MapHandler { diff --git a/src/net/eathena/maptypeproperty2.h b/src/net/eathena/maptypeproperty2.h index a7d2b4c41..dc7ca5a0d 100644 --- a/src/net/eathena/maptypeproperty2.h +++ b/src/net/eathena/maptypeproperty2.h @@ -21,22 +21,29 @@ #ifndef NET_EATHENA_MAPTYPEPROPERTY2_H #define NET_EATHENA_MAPTYPEPROPERTY2_H +#if defined(__GXX_EXPERIMENTAL_CXX0X__) +#include +#else +#include +#endif + namespace EAthena { struct MapTypeProperty2Bits final { - unsigned int party : 1; // allow attack party members (PvP) - unsigned int guild : 1; // allow attack guild members (GvG) - unsigned int siege : 1; // show emblem in GvG (WoE castle) - unsigned int mineffect : 1; // mine effect? - unsigned int nolockon : 1; // unknown - unsigned int countpk : 1; // show PvP counter - unsigned int nopartyformation : 1; // prevent party creation/modification - unsigned int bg : 1; // is on battle ground - unsigned int noitemconsumption : 1; // unused - unsigned int usecart : 1; // unused - unsigned int summonstarmiracle : 1; // unused - unsigned int SpareBits : 15; // unused bits + uint32_t party : 1; // allow attack party members (PvP) + uint32_t guild : 1; // allow attack guild members (GvG) + uint32_t siege : 1; // show emblem in GvG (WoE castle) + uint32_t mineffect : 1; // mine effect? + uint32_t nolockon : 1; // unknown + uint32_t countpk : 1; // show PvP counter + uint32_t nopartyformation : 1; // prevent party creation/ + // modification + uint32_t bg : 1; // is on battle ground + uint32_t noitemconsumption : 1; // unused + uint32_t usecart : 1; // unused + uint32_t summonstarmiracle : 1; // unused + uint32_t SpareBits : 15; // unused bits } __attribute__((packed)); union MapTypeProperty2 final diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index 8a8962a50..762c60816 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -473,7 +473,7 @@ void SkillHandler::processSkillAutoSpells(Net::MessageIn &msg) for (int f = 0; f < 7; f ++) msg.readInt32("skill id"); - menu = MenuType::AutoSpell;; + menu = MenuType::AutoSpell; } void SkillHandler::processSkillDevotionEffect(Net::MessageIn &msg) diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index c11dc6927..5f9a60e47 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -264,7 +264,7 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg) } } -void TradeHandler::processTradeUndo(Net::MessageIn &msg A_UNUSED) +void TradeHandler::processTradeUndo(Net::MessageIn &msg) { UNIMPLIMENTEDPACKET; // +++ here need clear trade window from partner side? diff --git a/src/net/maphandler.h b/src/net/maphandler.h index 7e6adbc06..a88d07009 100644 --- a/src/net/maphandler.h +++ b/src/net/maphandler.h @@ -42,4 +42,4 @@ class MapHandler notfinal extern Net::MapHandler *mapHandler; #endif // EATHENA_SUPPORT -#endif // NET_MAPTHANDLER_H +#endif // NET_MAPHANDLER_H diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index f18940630..867f9e10e 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -37,39 +37,42 @@ #include "gui/widgets/tabs/chat/partytab.h" #include "net/tmwa/adminhandler.h" -#include "net/tmwa/auctionhandler.h" -#include "net/tmwa/bankhandler.h" #include "net/tmwa/beinghandler.h" -#include "net/tmwa/buyingstorehandler.h" #include "net/tmwa/buysellhandler.h" -#include "net/tmwa/cashshophandler.h" #include "net/tmwa/chathandler.h" #include "net/tmwa/charserverhandler.h" -#include "net/tmwa/elementalhandler.h" -#include "net/tmwa/familyhandler.h" -#include "net/tmwa/friendshandler.h" #include "net/tmwa/gamehandler.h" #include "net/tmwa/guildhandler.h" -#include "net/tmwa/homunculushandler.h" #include "net/tmwa/inventoryhandler.h" #include "net/tmwa/itemhandler.h" #include "net/tmwa/loginhandler.h" -#include "net/tmwa/mailhandler.h" -#include "net/tmwa/maphandler.h" -#include "net/tmwa/markethandler.h" -#include "net/tmwa/mercenaryhandler.h" #include "net/tmwa/network.h" #include "net/tmwa/npchandler.h" #include "net/tmwa/partyhandler.h" #include "net/tmwa/pethandler.h" #include "net/tmwa/playerhandler.h" #include "net/tmwa/protocol.h" -#include "net/tmwa/searchstorehandler.h" #include "net/tmwa/serverfeatures.h" #include "net/tmwa/tradehandler.h" #include "net/tmwa/skillhandler.h" #include "net/tmwa/questhandler.h" + +#ifdef EATHENA_SUPPORT +#include "net/tmwa/auctionhandler.h" +#include "net/tmwa/bankhandler.h" +#include "net/tmwa/buyingstorehandler.h" +#include "net/tmwa/cashshophandler.h" +#include "net/tmwa/elementalhandler.h" +#include "net/tmwa/familyhandler.h" +#include "net/tmwa/friendshandler.h" +#include "net/tmwa/homunculushandler.h" +#include "net/tmwa/mailhandler.h" +#include "net/tmwa/maphandler.h" +#include "net/tmwa/markethandler.h" +#include "net/tmwa/mercenaryhandler.h" +#include "net/tmwa/searchstorehandler.h" #include "net/tmwa/vendinghandler.h" +#endif #include "resources/db/itemdbstat.h" diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp index da0cb2421..5cbae31b0 100644 --- a/src/net/tmwa/maphandler.cpp +++ b/src/net/tmwa/maphandler.cpp @@ -20,13 +20,6 @@ #include "net/tmwa/maphandler.h" -#include "logger.h" - -#include "net/ea/eaprotocol.h" - -#include "net/tmwa/messageout.h" -#include "net/tmwa/protocol.h" - #include "debug.h" extern Net::MapHandler *mapHandler; @@ -47,11 +40,6 @@ MapHandler::MapHandler() : void MapHandler::handleMessage(Net::MessageIn &msg) { - switch (msg.getId()) - { - default: - break; - } } } // namespace TmwAthena diff --git a/src/net/tmwa/maphandler.h b/src/net/tmwa/maphandler.h index 184137ef2..f532c1bb6 100644 --- a/src/net/tmwa/maphandler.h +++ b/src/net/tmwa/maphandler.h @@ -29,7 +29,6 @@ namespace TmwAthena { -class MessageOut; class MapHandler final : public MessageHandler, public Net::MapHandler { -- cgit v1.2.3-60-g2f50