summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-22 18:21:43 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-22 18:21:43 +0000
commit11c32ef5a809672ea69eb2c8f18715d98aabad03 (patch)
tree0741f71d756d62b3c940443f86ddcca5ef1a9a5b /src
parente2e580fb5d2fadafdfc7776b005dfc4562f5b624 (diff)
downloadmanaserv-11c32ef5a809672ea69eb2c8f18715d98aabad03.tar.gz
manaserv-11c32ef5a809672ea69eb2c8f18715d98aabad03.tar.bz2
manaserv-11c32ef5a809672ea69eb2c8f18715d98aabad03.tar.xz
manaserv-11c32ef5a809672ea69eb2c8f18715d98aabad03.zip
Fixed some small issues.
Diffstat (limited to 'src')
-rw-r--r--src/account-server/accounthandler.cpp2
-rw-r--r--src/game-server/mapreader.cpp3
-rw-r--r--src/utils/sha2.h1
3 files changed, 4 insertions, 2 deletions
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