summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/adminhandler.h2
-rw-r--r--src/net/ea/beinghandler.cpp4
-rw-r--r--src/net/ea/beinghandler.h2
-rw-r--r--src/net/ea/buysellhandler.h2
-rw-r--r--src/net/ea/charserverhandler.h2
-rw-r--r--src/net/ea/chathandler.h2
-rw-r--r--src/net/ea/gamehandler.h2
-rw-r--r--src/net/ea/gui/guildtab.h4
-rw-r--r--src/net/ea/gui/partytab.h4
-rw-r--r--src/net/ea/guildhandler.cpp22
-rw-r--r--src/net/ea/inventoryhandler.h2
-rw-r--r--src/net/ea/itemhandler.h2
-rw-r--r--src/net/ea/loginhandler.h2
-rw-r--r--src/net/ea/network.h2
-rw-r--r--src/net/ea/npchandler.h2
-rw-r--r--src/net/ea/partyhandler.cpp16
-rw-r--r--src/net/ea/partyhandler.h2
-rw-r--r--src/net/ea/playerhandler.h2
-rw-r--r--src/net/ea/skillhandler.h2
-rw-r--r--src/net/ea/tradehandler.cpp2
-rw-r--r--src/net/ea/tradehandler.h2
-rw-r--r--src/net/eathena/adminhandler.h2
-rw-r--r--src/net/eathena/beinghandler.cpp3
-rw-r--r--src/net/eathena/beinghandler.h4
-rw-r--r--src/net/eathena/buysellhandler.h4
-rw-r--r--src/net/eathena/charserverhandler.h4
-rw-r--r--src/net/eathena/chathandler.h2
-rw-r--r--src/net/eathena/gamehandler.cpp2
-rw-r--r--src/net/eathena/gamehandler.h4
-rw-r--r--src/net/eathena/generalhandler.h4
-rw-r--r--src/net/eathena/gui/guildtab.h4
-rw-r--r--src/net/eathena/gui/partytab.h4
-rw-r--r--src/net/eathena/guildhandler.cpp8
-rw-r--r--src/net/eathena/inventoryhandler.h2
-rw-r--r--src/net/eathena/itemhandler.h4
-rw-r--r--src/net/eathena/loginhandler.h4
-rw-r--r--src/net/eathena/network.cpp2
-rw-r--r--src/net/eathena/network.h4
-rw-r--r--src/net/eathena/npchandler.h4
-rw-r--r--src/net/eathena/partyhandler.h2
-rw-r--r--src/net/eathena/playerhandler.h4
-rw-r--r--src/net/eathena/skillhandler.h4
-rw-r--r--src/net/eathena/tradehandler.h2
-rw-r--r--src/net/tmwa/adminhandler.h2
-rw-r--r--src/net/tmwa/beinghandler.cpp4
-rw-r--r--src/net/tmwa/beinghandler.h2
-rw-r--r--src/net/tmwa/buysellhandler.h2
-rw-r--r--src/net/tmwa/charserverhandler.h2
-rw-r--r--src/net/tmwa/chathandler.h2
-rw-r--r--src/net/tmwa/gamehandler.h2
-rw-r--r--src/net/tmwa/generalhandler.h2
-rw-r--r--src/net/tmwa/gui/guildtab.h4
-rw-r--r--src/net/tmwa/gui/partytab.h4
-rw-r--r--src/net/tmwa/inventoryhandler.h2
-rw-r--r--src/net/tmwa/itemhandler.h2
-rw-r--r--src/net/tmwa/loginhandler.h2
-rw-r--r--src/net/tmwa/network.cpp2
-rw-r--r--src/net/tmwa/network.h2
-rw-r--r--src/net/tmwa/npchandler.h2
-rw-r--r--src/net/tmwa/partyhandler.h2
-rw-r--r--src/net/tmwa/playerhandler.h2
-rw-r--r--src/net/tmwa/questhandler.h2
-rw-r--r--src/net/tmwa/skillhandler.h2
-rw-r--r--src/net/tmwa/tradehandler.h2
64 files changed, 103 insertions, 104 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
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h
index 9efc4acf5..9b8490f50 100644
--- a/src/net/eathena/adminhandler.h
+++ b/src/net/eathena/adminhandler.h
@@ -51,6 +51,6 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
void kick(const int playerId) const override;
};
-} // namespace EAthena
+} // namespace EAthena
#endif // NET_EATHENA_ADMINHANDLER_H
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 6de4bf1b7..f3680f3c9 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -588,7 +588,6 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
logger->log("dstBeing id:" + toString(dstBeing->getId()));
logger->log("dstBeing name:" + dstBeing->getName());
break;
-
}
}
else if (msgType == 3)
@@ -805,4 +804,4 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg,
dstBeing->setStatusEffectBlock(16, statusEffects & 0xffff);
}
-} // namespace EAthena
+} // namespace EAthena
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index 360d8ca2b..cc65c3ea8 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -59,6 +59,6 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
const int type) const;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_BEINGHANDLER_H
+#endif // NET_EATHENA_BEINGHANDLER_H
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index 0a1042174..ca3abfd09 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -46,6 +46,6 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
virtual void processNpcSellResponse(Net::MessageIn &msg) const;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_BUYSELLHANDLER_H
+#endif // NET_EATHENA_BUYSELLHANDLER_H
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index 3a49dbb9a..2dfdff8c1 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -70,6 +70,6 @@ class CharServerHandler final : public MessageHandler,
const bool) const override;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_CHARSERVERHANDLER_H
+#endif // NET_EATHENA_CHARSERVERHANDLER_H
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 6840116da..1d31b3c16 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -61,6 +61,6 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
static void processRaw(MessageOut &outMsg, const std::string &line);
};
-} // namespace EAthena
+} // namespace EAthena
#endif // NET_EATHENA_CHATHANDLER_H
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 2ec9899c2..cdb3029bc 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -171,7 +171,7 @@ void GameHandler::disconnect2() const
void GameHandler::processMapCharId(Net::MessageIn &msg) const
{
- msg.readInt32(); // char id
+ msg.readInt32(); // char id
}
} // namespace EAthena
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index 2de3ccaac..61959ecd1 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -62,6 +62,6 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
{ return true; }
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_MAPHANDLER_H
+#endif // NET_EATHENA_MAPHANDLER_H
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index a0b65b842..fc86beff2 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -79,6 +79,6 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mTradeHandler;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_GENERALHANDLER_H
+#endif // NET_EATHENA_GENERALHANDLER_H
diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h
index 77fbc3ee7..eb4ac077e 100644
--- a/src/net/eathena/gui/guildtab.h
+++ b/src/net/eathena/gui/guildtab.h
@@ -41,6 +41,6 @@ class GuildTab : public Ea::GuildTab
~GuildTab();
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // EATHENA_GUILDTAB_H
+#endif // EATHENA_GUILDTAB_H
diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h
index 4569b7f05..1e9bbc920 100644
--- a/src/net/eathena/gui/partytab.h
+++ b/src/net/eathena/gui/partytab.h
@@ -41,6 +41,6 @@ class PartyTab : public Ea::PartyTab
~PartyTab();
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // EATHENA_PARTYTAB_H
+#endif // EATHENA_PARTYTAB_H
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index e9d4109dc..8785fd83c 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -233,7 +233,7 @@ void GuildHandler::inviteResponse(const int guildId,
MessageOut msg(CMSG_GUILD_INVITE_REPLY);
msg.writeInt32(guildId);
msg.writeInt8(response);
- msg.writeInt8(0); // unused
+ msg.writeInt8(0); // unused
msg.writeInt16(0); // unused
}
@@ -244,9 +244,9 @@ void GuildHandler::leave(const int guildId) const
MessageOut msg(CMSG_GUILD_LEAVE);
msg.writeInt32(guildId);
- msg.writeInt32(player_node->getId()); // Account ID
- msg.writeInt32(PlayerInfo::getCharId()); // Char ID
- msg.writeString("", 40); // Message
+ msg.writeInt32(player_node->getId()); // Account ID
+ msg.writeInt32(PlayerInfo::getCharId()); // Char ID
+ msg.writeString("", 40); // Message
}
void GuildHandler::kick(const GuildMember *const member,
diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h
index f6e87fd2a..25fc25b17 100644
--- a/src/net/eathena/inventoryhandler.h
+++ b/src/net/eathena/inventoryhandler.h
@@ -60,6 +60,6 @@ class InventoryHandler final : public MessageHandler,
const int amount, const int destination) const override;
};
-} // namespace EAthena
+} // namespace EAthena
#endif // NET_EATHENA_INVENTORYHANDLER_H
diff --git a/src/net/eathena/itemhandler.h b/src/net/eathena/itemhandler.h
index f3ae193de..071dc7337 100644
--- a/src/net/eathena/itemhandler.h
+++ b/src/net/eathena/itemhandler.h
@@ -40,6 +40,6 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
virtual void handleMessage(Net::MessageIn &msg) override;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_ITEMHANDLER_H
+#endif // NET_EATHENA_ITEMHANDLER_H
diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h
index d542777cd..00eee5949 100644
--- a/src/net/eathena/loginhandler.h
+++ b/src/net/eathena/loginhandler.h
@@ -77,6 +77,6 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
const std::string &email) const override;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_LOGINHANDLER_H
+#endif // NET_EATHENA_LOGINHANDLER_H
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 42d16396d..1b234a13c 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -109,7 +109,7 @@ short packet_lengths[] =
};
static const int packet_lengths_size
- = static_cast<int>(sizeof(packet_lengths) / sizeof (short));
+ = static_cast<int>(sizeof(packet_lengths) / sizeof(short));
static const int messagesSize = 0xffff;
Network *Network::mInstance = nullptr;
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index 8babc4d19..ea7a5506d 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -66,6 +66,6 @@ class Network final : public Ea::Network
static Network *mInstance;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_NETWORK_H
+#endif // NET_EATHENA_NETWORK_H
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index 196da8398..e48c0e8ab 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -78,6 +78,6 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
void processNpcViewPoint(Net::MessageIn &msg, const int npcId) const;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_NPCHANDLER_H
+#endif // NET_EATHENA_NPCHANDLER_H
diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h
index 7e3e6630b..ec79c2c57 100644
--- a/src/net/eathena/partyhandler.h
+++ b/src/net/eathena/partyhandler.h
@@ -65,6 +65,6 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
void setShareItems(const PartyShare share) const override;
};
-} // namespace EAthena
+} // namespace EAthena
#endif // NET_EATHENA_PARTYHANDLER_H
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index ec8fcd5cb..6cea52890 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -63,6 +63,6 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
void respawn() const override;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_PLAYERHANDLER_H
+#endif // NET_EATHENA_PLAYERHANDLER_H
diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h
index a44718d3f..2680d2c56 100644
--- a/src/net/eathena/skillhandler.h
+++ b/src/net/eathena/skillhandler.h
@@ -51,6 +51,6 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler
void useMap(const int id, const std::string &map) const override;
};
-} // namespace EAthena
+} // namespace EAthena
-#endif // NET_EATHENA_SKILLHANDLER_H
+#endif // NET_EATHENA_SKILLHANDLER_H
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index 290a0fd92..89284f5cd 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -57,6 +57,6 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
void cancel() const override;
};
-} // namespace EAthena
+} // namespace EAthena
#endif // NET_EATHENA_TRADEHANDLER_H
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 07f3fbd8e..621bf6466 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -51,6 +51,6 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler
void kick(const int playerId) const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_ADMINHANDLER_H
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 8e367b0c3..07cef46fd 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -486,7 +486,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
colors[1] = msg.readInt8();
colors[2] = msg.readInt8();
- msg.readInt8(); //unused
+ msg.readInt8(); // unused
const int guild = msg.readInt32(); // guild
@@ -598,7 +598,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg,
break;
default:
- //need set stay state?
+ // need set stand state?
logger->log("QQQ2 SMSG_PLAYER_UPDATE_1:"
+ toString(id) + " " + toString(type));
logger->log("dstBeing id:"
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 39b868b24..2aafcc699 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -56,6 +56,6 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
const int type) const;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_BEINGHANDLER_H
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index aa1092ffc..a74272816 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -46,6 +46,6 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler
virtual void processNpcSellResponse(Net::MessageIn &msg) const;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_BUYSELLHANDLER_H
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 9d4006a4a..a4fc5c572 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -70,6 +70,6 @@ class CharServerHandler final : public MessageHandler,
const bool withColors) const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_CHARSERVERHANDLER_H
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index eae168e59..b9a0e71bc 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -61,6 +61,6 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
static void processRaw(MessageOut &outMsg, const std::string &line);
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_CHATHANDLER_H
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 9a63ddaf4..37b1d0570 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -60,6 +60,6 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
{ return false; }
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_MAPHANDLER_H
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 57f704074..145da6793 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -80,6 +80,6 @@ class GeneralHandler final : public MessageHandler,
MessageHandlerPtr mQuestHandler;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_GENERALHANDLER_H
diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h
index 67e2a3ee9..950c6ad10 100644
--- a/src/net/tmwa/gui/guildtab.h
+++ b/src/net/tmwa/gui/guildtab.h
@@ -41,6 +41,6 @@ class GuildTab : public Ea::GuildTab
~GuildTab();
};
-} // namespace TmwAthena
+} // namespace TmwAthena
-#endif // TA_GUILDTAB_H
+#endif // TA_GUILDTAB_H
diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h
index 6d33c6ce9..08ac9bad7 100644
--- a/src/net/tmwa/gui/partytab.h
+++ b/src/net/tmwa/gui/partytab.h
@@ -41,6 +41,6 @@ class PartyTab : public Ea::PartyTab
~PartyTab();
};
-} // namespace TmwAthena
+} // namespace TmwAthena
-#endif // TA_PARTYTAB_H
+#endif // TA_PARTYTAB_H
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 707a9169c..124aedd2f 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -60,6 +60,6 @@ class InventoryHandler final : public MessageHandler,
const int amount, const int destination) const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_INVENTORYHANDLER_H
diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h
index 06359c1d9..a343b4e8d 100644
--- a/src/net/tmwa/itemhandler.h
+++ b/src/net/tmwa/itemhandler.h
@@ -40,6 +40,6 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler
virtual void handleMessage(Net::MessageIn &msg) override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_ITEMHANDLER_H
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 6d8436fbd..c327b558b 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -76,6 +76,6 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler
const std::string &email) const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_LOGINHANDLER_H
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 120cbb158..dd752af72 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -87,7 +87,7 @@ short packet_lengths[] =
};
static const int packet_lengths_size
- = static_cast<int>(sizeof(packet_lengths) / sizeof (short));
+ = static_cast<int>(sizeof(packet_lengths) / sizeof(short));
static const int messagesSize = 0xffff;
Network *Network::mInstance = nullptr;
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 1d89d9a76..54d082cb5 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -67,6 +67,6 @@ class Network final : public Ea::Network
static Network *mInstance;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_NETWORK_H
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 139f37872..db7d5ade1 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -82,6 +82,6 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
bool mRequestLang;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_NPCHANDLER_H
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 6efd87868..0d1ca1f38 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -65,6 +65,6 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
void setShareItems(const PartyShare share) const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_PARTYHANDLER_H
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 8307d7d05..b8f019d2c 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -61,6 +61,6 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
void respawn() const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_PLAYERHANDLER_H
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index 61d40d6b1..f87b27cc0 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -47,6 +47,6 @@ class QuestHandler final : public MessageHandler
void processPlayerQuests(Net::MessageIn &msg) const;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_QUESTHANDLER_H
diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h
index 12a6021e5..2dcd60540 100644
--- a/src/net/tmwa/skillhandler.h
+++ b/src/net/tmwa/skillhandler.h
@@ -51,6 +51,6 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler
void useMap(const int id, const std::string &map) const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_SKILLHANDLER_H
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 7a88c61be..6a4f8f59d 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -57,6 +57,6 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
void cancel() const override;
};
-} // namespace TmwAthena
+} // namespace TmwAthena
#endif // NET_TA_TRADEHANDLER_H