diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-10 15:31:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-10 15:31:36 +0300 |
| commit | c757bf80478dd5e4e40a6c24b436954ab498a855 (patch) | |
| tree | 8b73b31f6ca857d3a7affb86e324990b70baf68a /src/net/eathena | |
| parent | a7524c70c71cbdaed7e541105d9c743fb18f56cf (diff) | |
| download | manaplus-c757bf80478dd5e4e40a6c24b436954ab498a855.tar.gz manaplus-c757bf80478dd5e4e40a6c24b436954ab498a855.tar.bz2 manaplus-c757bf80478dd5e4e40a6c24b436954ab498a855.tar.xz manaplus-c757bf80478dd5e4e40a6c24b436954ab498a855.zip | |
Fix code style.
Diffstat (limited to 'src/net/eathena')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/eathena/guildhandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/eathena/tradehandler.cpp | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 7b3c3fcaf..d0c3f1640 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -1947,7 +1947,7 @@ void BeingHandler::processBeingFakeName(Net::MessageIn &msg) const msg.readUInt8("object type")); const int id = msg.readInt32("npc id"); msg.skip(8, "unused"); - const int job = msg.readInt16("class?"); // 111 + const uint16_t job = msg.readInt16("class?"); // 111 msg.skip(30, "unused"); uint16_t x, y; uint8_t dir; diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 5308fdaea..5db0a0d79 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -569,8 +569,8 @@ void CharServerHandler::processCharRename(Net::MessageIn &msg) void CharServerHandler::changeSlot(const int oldSlot, const int newSlot) { createOutPacket(CMSG_CHAR_CHANGE_SLOT); - outMsg.writeInt16(oldSlot, "old slot"); - outMsg.writeInt16(newSlot, "new slot"); + outMsg.writeInt16(static_cast<int16_t>(oldSlot), "old slot"); + outMsg.writeInt16(static_cast<int16_t>(newSlot), "new slot"); outMsg.writeInt16(0, "unused"); } diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 5e7ed61a7..a1ea449c5 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -23,7 +23,6 @@ #include "actormanager.h" #include "configuration.h" -#include "notifymanager.h" #include "being/localplayer.h" #include "being/playerinfo.h" @@ -36,10 +35,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - -#include "utils/delete2.h" - #include "debug.h" extern Net::GuildHandler *guildHandler; diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 05fd893ca..ef38a4e67 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -22,7 +22,6 @@ #include "net/eathena/tradehandler.h" -#include "inventory.h" #include "item.h" #include "notifymanager.h" |