diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-16 00:27:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-16 00:27:51 +0300 |
| commit | c3434fa53d1c83bc65b640951364f842fe6c79f4 (patch) | |
| tree | 51aa552c585518d7b2e2d67eba7c9500065dae05 /src/net/ea | |
| parent | 185a53c504a0d53e54a7425ea829b5c951661ea8 (diff) | |
| download | manaplus-c3434fa53d1c83bc65b640951364f842fe6c79f4.tar.gz manaplus-c3434fa53d1c83bc65b640951364f842fe6c79f4.tar.bz2 manaplus-c3434fa53d1c83bc65b640951364f842fe6c79f4.tar.xz manaplus-c3434fa53d1c83bc65b640951364f842fe6c79f4.zip | |
Fix some signed/unsigned chars issues.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/gui/partytab.cpp | 4 | ||||
| -rw-r--r-- | src/net/ea/network.h | 6 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/specialhandler.cpp | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index cc2c653b6..198cfea33 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -164,7 +164,7 @@ bool PartyTab::handleCommand(const std::string &type, const std::string &args) } } - const char opt = CommandHandler::parseBoolean(args); + const signed char opt = CommandHandler::parseBoolean(args); switch (opt) { @@ -203,7 +203,7 @@ bool PartyTab::handleCommand(const std::string &type, const std::string &args) } } - const char opt = CommandHandler::parseBoolean(args); + const signed char opt = CommandHandler::parseBoolean(args); switch (opt) { diff --git a/src/net/ea/network.h b/src/net/ea/network.h index deb770dba..4fbf0ebbe 100644 --- a/src/net/ea/network.h +++ b/src/net/ea/network.h @@ -96,8 +96,10 @@ class Network ServerInfo mServer; - char *mInBuffer, *mOutBuffer; - unsigned int mInSize, mOutSize; + char *mInBuffer; + char *mOutBuffer; + unsigned int mInSize; + unsigned int mOutSize; unsigned int mToSkip; diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index de687e96b..0beea449f 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -91,7 +91,7 @@ namespace static const char *randomDeathMessage() { - static char const *const deadMsg[] = + static const char *const deadMsg[] = { N_("You are dead."), N_("We regret to inform you that your character was killed in " diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index 7bb69954f..527437f84 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -127,8 +127,8 @@ void SpecialHandler::processSkillFailed(Net::MessageIn &msg) const int skillId = msg.readInt16(); const short bskill = msg.readInt16(); msg.readInt16(); // btype - const char success = msg.readInt8(); - const char reason = msg.readInt8(); + const signed char success = msg.readInt8(); + const signed char reason = msg.readInt8(); if (success != static_cast<int>(SKILL_FAILED) && bskill == static_cast<int>(BSKILL_EMOTE)) { |