diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-18 22:13:37 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-18 22:13:37 +0200 |
| commit | f4792bc06f21335fc2d1171d937ea7645ca0c253 (patch) | |
| tree | c7b11cf81f254f5b9ed2f5dbfe127649abc7545a /src/net/tmwa/guildhandler.cpp | |
| parent | f98d003e354a1792117b7cbc771d1dd91475a156 (diff) | |
| download | manaplus-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.gz manaplus-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.bz2 manaplus-f4792bc06f21335fc2d1171d937ea7645ca0c253.tar.xz manaplus-f4792bc06f21335fc2d1171d937ea7645ca0c253.zip | |
Fix most conversions except manaserv net code and some other code.
Diffstat (limited to 'src/net/tmwa/guildhandler.cpp')
| -rw-r--r-- | src/net/tmwa/guildhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index ed738df4f..198dafeca 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -136,7 +136,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) msg.readInt8(); // Unused std::string guildName = msg.readString(24); - Guild *g = Guild::getGuild(guildId); + Guild *g = Guild::getGuild(static_cast<short int>(guildId)); if (!g) break; @@ -219,7 +219,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg) _("Guild castle: %s"), castle.c_str()), BY_SERVER); } - Guild *g = Guild::getGuild(guildId); + Guild *g = Guild::getGuild(static_cast<short int>(guildId)); if (!g) break; g->setName(name); @@ -703,8 +703,8 @@ void GuildHandler::chat(int guildId _UNUSED_, const std::string &text) std::string str = player_node->getName() + " : " + text; MessageOut msg(CMSG_GUILD_MESSAGE); - msg.writeInt16(str.size() + 4); - msg.writeString(str, str.length()); + msg.writeInt16(static_cast<Uint16>(str.size() + 4)); + msg.writeString(str, static_cast<int>(str.length())); } void GuildHandler::memberList(int guildId _UNUSED_) |