diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/account-server/accounthandler.cpp | 2 | ||||
| -rw-r--r-- | src/game-server/mapreader.cpp | 3 | ||||
| -rw-r--r-- | src/utils/sha2.h | 1 |
4 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-04-22 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/account-server/accounthandler.cpp, src/utils/sha2.h, + src/game-server/mapreader.cpp: Fixed some small issues. + 2008-04-22 David Athay <ko2fan@gmail.com> * src/chat-server/chathandler.cpp, src/chat-server/chathandler.hpp, diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp index 20b3b9be..59909fe9 100644 --- a/src/account-server/accounthandler.cpp +++ b/src/account-server/accounthandler.cpp @@ -453,7 +453,7 @@ static void handlePasswordChangeMessage(AccountClient &computer, MessageIn &msg) { reply.writeByte(ERRMSG_NO_LOGIN); } - else if (newPassword.length() != Encryption::SHA256HashLength) + else if (newPassword.length() != (std::string::size_type) Encryption::SHA256HashLength) { reply.writeByte(ERRMSG_INVALID_ARGUMENT); } diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp index f8dd24d9..6d939b5f 100644 --- a/src/game-server/mapreader.cpp +++ b/src/game-server/mapreader.cpp @@ -279,7 +279,8 @@ static Map *readMap(xmlNodePtr node, std::string const &path, MapComposite *comp } else { - LOG_WARN("Unrecognized format for spawn area"); + LOG_WARN("Couldn't find monster ID %d for spawn area", + monsterId); } } else if (objType == "NPC") diff --git a/src/utils/sha2.h b/src/utils/sha2.h index 79f6b862..1f7974af 100644 --- a/src/utils/sha2.h +++ b/src/utils/sha2.h @@ -43,6 +43,7 @@ #include <string>
#include <stdexcept>
+#include <cstring>
// NOTE: You may need to define things by hand for your system:
typedef unsigned char sha_byte; // Exactly 1 byte
|