diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 11:27:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 12:34:23 +0300 |
commit | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (patch) | |
tree | ba2d006e8aaac74138eb13ba458d30abf8f01182 /src/net/ea | |
parent | 9569f124d176b4220f28f9a41812c33883737228 (diff) | |
download | manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2 manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip |
some more style fixes from cpplint.
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/adminhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/beinghandler.cpp | 4 | ||||
-rw-r--r-- | src/net/ea/beinghandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/buysellhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/charserverhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/chathandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/gamehandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/guildtab.h | 4 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.h | 4 | ||||
-rw-r--r-- | src/net/ea/guildhandler.cpp | 22 | ||||
-rw-r--r-- | src/net/ea/inventoryhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/itemhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/loginhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/network.h | 2 | ||||
-rw-r--r-- | src/net/ea/npchandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/partyhandler.cpp | 16 | ||||
-rw-r--r-- | src/net/ea/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/playerhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/skillhandler.h | 2 | ||||
-rw-r--r-- | src/net/ea/tradehandler.cpp | 2 | ||||
-rw-r--r-- | src/net/ea/tradehandler.h | 2 |
21 files changed, 41 insertions, 41 deletions
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index fa2addfea..06dc7ab8c 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -57,6 +57,6 @@ class AdminHandler : public Net::AdminHandler const int x, const int y) const override; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_ADMINHANDLER_H diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 6f9cef522..8fb443803 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -556,7 +556,7 @@ void BeingHandler::processBeingSelfEffect(Net::MessageIn &msg) const if (Particle::enabled) effectManager->trigger(effectType, being); - //+++ need dehard code effectType == 3 + // +++ need dehard code effectType == 3 if (effectType == 3 && being->getType() == Being::PLAYER && socialWindow) { // reset received damage @@ -806,4 +806,4 @@ void BeingHandler::processPvpSet(Net::MessageIn &msg) const } } -} // namespace Ea +} // namespace Ea diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index 9f8fd7842..46a28b908 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -102,6 +102,6 @@ class BeingHandler : public Net::BeingHandler bool mHideShield; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_BEINGHANDLER_H diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 2240872b9..fb7db09e0 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -65,6 +65,6 @@ class BuySellHandler : public Net::BuySellHandler BuyDialog *mBuyDialog; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_BUYSELLHANDLER_H diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index 6622371b3..be91ef017 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -92,6 +92,6 @@ class CharServerHandler : public Net::CharServerHandler const bool withColors) const = 0; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_CHARSERVERHANDLER_H diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 869d52153..fb286a845 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -63,6 +63,6 @@ class ChatHandler : public Net::ChatHandler bool mShowAllLang; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_CHATHANDLER_H diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index d6c9cebdc..98b108a0d 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -64,6 +64,6 @@ class GameHandler : public Net::GameHandler int mCharID; /// < Saved for map-server switching }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_GAMEHANDLER_H diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index d7b48f09f..6558cbef1 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -60,6 +60,6 @@ class GuildTab : public ChatTab, public ConfigListener void getAutoCompleteList(StringVect &names) const override; }; -} // namespace Ea +} // namespace Ea -#endif // EA_GUILDTAB_H +#endif // EA_GUILDTAB_H diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 129125faf..e1fd7e4c3 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -60,6 +60,6 @@ class PartyTab : public ChatTab extern PartyTab *partyTab; -} // namespace Ea +} // namespace Ea -#endif // EA_PARTYTAB_H +#endif // EA_PARTYTAB_H diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 19f892ed5..65fa32634 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -156,17 +156,17 @@ void GuildHandler::processGuildMasterOrMember(Net::MessageIn &msg) const void GuildHandler::processGuildBasicInfo(Net::MessageIn &msg) { - const int guildId = msg.readInt32(); // Guild ID - const int level = msg.readInt32(); // Guild level - const int members = msg.readInt32(); // 'Connect member' - const int maxMembers = msg.readInt32(); // 'Max member' - const int avgLevel = msg.readInt32(); // Average level - const int exp = msg.readInt32(); // Exp - const int nextExp = msg.readInt32(); // Next exp - msg.skip(16); // 0 unused - std::string name = msg.readString(24); // Name - std::string master = msg.readString(24); // Master's name - std::string castle = msg.readString(20); // Castles + const int guildId = msg.readInt32(); // Guild ID + const int level = msg.readInt32(); // Guild level + const int members = msg.readInt32(); // 'Connect member' + const int maxMembers = msg.readInt32(); // 'Max member' + const int avgLevel = msg.readInt32(); // Average level + const int exp = msg.readInt32(); // Exp + const int nextExp = msg.readInt32(); // Next exp + msg.skip(16); // 0 unused + std::string name = msg.readString(24); // Name + std::string master = msg.readString(24); // Master's name + std::string castle = msg.readString(20); // Castles // (ie: "Six Castles" or "None Taken") if (guildTab && showBasicInfo) diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 2d47853f6..415acd2e5 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -210,6 +210,6 @@ class InventoryHandler : public Net::InventoryHandler PickupQueue mSentPickups; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_INVENTORYHANDLER_H diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index 193c3f7c9..5aa1ee51a 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -43,6 +43,6 @@ class ItemHandler void processItemDropped(Net::MessageIn &msg); }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_ITEMHANDLER_H diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 1efc94a2a..0c290f583 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -104,6 +104,6 @@ class LoginHandler : public Net::LoginHandler Token mToken; }; -} // namespace Ea +} // namespace Ea #endif // NET_TA_LOGINHANDLER_H diff --git a/src/net/ea/network.h b/src/net/ea/network.h index 5e957346b..823fa2714 100644 --- a/src/net/ea/network.h +++ b/src/net/ea/network.h @@ -112,6 +112,6 @@ class Network int mSleep; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_NETWORK_H diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 526ced9f0..6bc88aac7 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -75,6 +75,6 @@ class NpcHandler : public Net::NpcHandler NpcDialog *mDialog; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_NPCHANDLER_H diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 0c00588ce..0909232dd 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -266,19 +266,19 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg) void PartyHandler::processPartyMove(Net::MessageIn &msg) const { - const int id = msg.readInt32(); // id + const int id = msg.readInt32(); // id PartyMember *m = nullptr; if (Ea::taParty) m = Ea::taParty->getMember(id); if (m) { - msg.skip(4); // 0 - m->setX(msg.readInt16()); // x - m->setY(msg.readInt16()); // y - m->setOnline(msg.readInt8()); // online (if 0) - msg.readString(24); // party - msg.readString(24); // nick - m->setMap(msg.readString(16)); // map + msg.skip(4); // 0 + m->setX(msg.readInt16()); // x + m->setY(msg.readInt16()); // y + m->setOnline(msg.readInt8()); // online (if 0) + msg.readString(24); // party + msg.readString(24); // nick + m->setMap(msg.readString(16)); // map } else { diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 62d08034a..9a9867916 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -84,6 +84,6 @@ class PartyHandler : public Net::PartyHandler extern PartyTab *partyTab; extern Party *taParty; -} // namespace Ea +} // namespace Ea #endif // NET_EA_PARTYHANDLER_H diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 57ff3b6af..02241df97 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -73,6 +73,6 @@ class PlayerHandler : public Net::PlayerHandler void processPlayerArrowMessage(Net::MessageIn &msg) const; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_PLAYERHANDLER_H diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h index f0be31d58..8a5cb93cc 100644 --- a/src/net/ea/skillhandler.h +++ b/src/net/ea/skillhandler.h @@ -44,6 +44,6 @@ class SkillHandler : public Net::SkillHandler void processSkillFailed(Net::MessageIn &msg) const; }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_SKILLHANDLER_H diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 1da4271b1..aa6952b65 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -57,7 +57,7 @@ namespace Net::getTradeHandler()->respond(eventId == "yes"); } } listener; -} // anonimous +} // namespace namespace Ea { diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index b7be2704e..c01f36fd8 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -54,6 +54,6 @@ class TradeHandler : public Net::TradeHandler void processTradeComplete(Net::MessageIn &msg); }; -} // namespace Ea +} // namespace Ea #endif // NET_EA_TRADEHANDLER_H |