diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-08-25 14:27:40 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-08-25 14:27:40 +0100 |
| commit | 3e2f037b2059ef75140b17750eb98655cd8438c5 (patch) | |
| tree | c40fa6f25ca56616c7fda83e8fa2c608497ad8b5 | |
| parent | ee3d3ab1ff5589036c41c236e4fc376f11854467 (diff) | |
Core&Tools: Fix warnings and non-pch build
| -rw-r--r-- | src/server/authserver/Authentication/TOTP.cpp | 3 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/wmo.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/authserver/Authentication/TOTP.cpp b/src/server/authserver/Authentication/TOTP.cpp index 43c97c296d9..51a21822bc0 100644 --- a/src/server/authserver/Authentication/TOTP.cpp +++ b/src/server/authserver/Authentication/TOTP.cpp @@ -16,6 +16,7 @@ */ #include "TOTP.h" +#include <cstring> int base32_decode(const char* encoded, char* result, int bufSize) { @@ -29,7 +30,7 @@ int base32_decode(const char* encoded, char* result, int bufSize) for (const char *ptr = encoded; count < bufSize && *ptr; ++ptr) { char ch = *ptr; - if (ch == ' ' || ch == ' ' || ch == '\r' || ch == '\n' || ch == '-') + if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n' || ch == '-') continue; buffer <<= 5; diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index 57161cb495a..c606f06f6db 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -139,9 +139,9 @@ bool WMORoot::ConvertToVMAPRootWmo(FILE* pOutfile) WMOGroup::WMOGroup(const std::string &filename) : filename(filename), MOPY(0), MOVI(0), MoviEx(0), MOVT(0), MOBA(0), MobaEx(0), hlq(0), LiquEx(0), LiquBytes(0), groupName(0), descGroupName(0), mogpFlags(0), - mopy_size(0), moba_size(0), LiquEx_size(0), nVertices(0), nTriangles(0), - moprIdx(0), moprNItems(0), nBatchA(0), nBatchB(0), fogIdx(0), liquidType(0), - groupWMOID(0), liquflags(0) + moprIdx(0), moprNItems(0), nBatchA(0), nBatchB(0), nBatchC(0), fogIdx(0), + liquidType(0), groupWMOID(0), mopy_size(0), moba_size(0), LiquEx_size(0), + nVertices(0), nTriangles(0), liquflags(0) { memset(bbcorn1, 0, sizeof(bbcorn1)); memset(bbcorn2, 0, sizeof(bbcorn2)); |