summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-14 11:27:04 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-14 12:34:23 +0300
commita7d7346b9eb3fa62a8912e31d5c00f8e05390425 (patch)
treeba2d006e8aaac74138eb13ba458d30abf8f01182 /src/net/eathena
parent9569f124d176b4220f28f9a41812c33883737228 (diff)
downloadplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz
plus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2
plus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz
plus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip
some more style fixes from cpplint.
Diffstat (limited to 'src/net/eathena')
-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
22 files changed, 38 insertions, 39 deletions
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