summaryrefslogtreecommitdiff
path: root/src/net/eathena/adminhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-07 16:18:13 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-07 16:18:13 +0300
commit9fe21fcd8883b37bdc30224822e6e42afb35b8f0 (patch)
tree798117abd4dc7e610997d59d530a96ddc1509f53 /src/net/eathena/adminhandler.cpp
parent4429cb14e9e187edef27aba692a4266733f79c17 (diff)
downloadmv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.gz
mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.bz2
mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.tar.xz
mv-9fe21fcd8883b37bdc30224822e6e42afb35b8f0.zip
Replace most static_cast<Type> to shorter versions from defines.
Diffstat (limited to 'src/net/eathena/adminhandler.cpp')
-rw-r--r--src/net/eathena/adminhandler.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 14afde54c..6c7914a32 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -45,15 +45,15 @@ AdminHandler::AdminHandler() :
void AdminHandler::announce(const std::string &text) const
{
createOutPacket(CMSG_ADMIN_ANNOUNCE);
- outMsg.writeInt16(static_cast<int16_t>(text.length() + 4), "len");
- outMsg.writeString(text, static_cast<int>(text.length()), "message");
+ outMsg.writeInt16(CAST_S16(text.length() + 4), "len");
+ outMsg.writeString(text, CAST_S32(text.length()), "message");
}
void AdminHandler::localAnnounce(const std::string &text) const
{
createOutPacket(CMSG_ADMIN_LOCAL_ANNOUNCE);
- outMsg.writeInt16(static_cast<int16_t>(text.length() + 4), "len");
- outMsg.writeString(text, static_cast<int>(text.length()), "message");
+ outMsg.writeInt16(CAST_S16(text.length() + 4), "len");
+ outMsg.writeString(text, CAST_S32(text.length()), "message");
}
void AdminHandler::hide(const bool h A_UNUSED) const
@@ -77,8 +77,8 @@ void AdminHandler::warp(const std::string &map, const int x, const int y) const
{
createOutPacket(CMSG_PLAYER_MAPMOVE);
outMsg.writeString(map, 16, "map");
- outMsg.writeInt16(static_cast<int16_t>(x), "x");
- outMsg.writeInt16(static_cast<int16_t>(y), "y");
+ outMsg.writeInt16(CAST_S16(x), "x");
+ outMsg.writeInt16(CAST_S16(y), "y");
}
void AdminHandler::resetStats() const
@@ -114,8 +114,8 @@ void AdminHandler::mute(const Being *const being,
createOutPacket(CMSG_ADMIN_MUTE);
outMsg.writeBeingId(being->getId(), "account id");
- outMsg.writeInt8(static_cast<int8_t>(type), "type");
- outMsg.writeInt16(static_cast<int16_t>(limit), "value");
+ outMsg.writeInt8(CAST_S8(type), "type");
+ outMsg.writeInt16(CAST_S16(limit), "value");
}
void AdminHandler::muteName(const std::string &name) const
@@ -137,9 +137,9 @@ void AdminHandler::setTileType(const int x, const int y,
const int type) const
{
createOutPacket(CMSG_ADMIN_SET_TILE_TYPE);
- outMsg.writeInt16(static_cast<int16_t>(x), "x");
- outMsg.writeInt16(static_cast<int16_t>(y), "y");
- outMsg.writeInt16(static_cast<int16_t>(type), "type");
+ outMsg.writeInt16(CAST_S16(x), "x");
+ outMsg.writeInt16(CAST_S16(y), "y");
+ outMsg.writeInt16(CAST_S16(type), "type");
}
void AdminHandler::unequipAll(const Being *const being) const