diff options
| author | maximius <none@none> | 2009-09-18 14:10:37 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-18 14:10:37 -0700 |
| commit | 333f1c9d729e99c86b9747aa95336010589d564d (patch) | |
| tree | c93e94781a126a8ad7a62e846df04adb7c913905 /src/shared/Auth | |
| parent | 0d9d400e794f6bcd2f706a4fb238b6428ad00862 (diff) | |
*[8475] fixed some gcc-warnings Author: balrok
*[8476] Revert some recent cleanup changes, some other fixes and cleanups. Author: VladimirMangos
*[8489] Fixed player visibility update in case view point different from player itself. Author: SilverIce
*[8493] Avoid unexpected multiply error messages at wrong `quest_template`.`RewSpell*` Author: VladimirMangos
*[8496] Resolve some #include cycles and unsafe code.
* Common.h -> Threading.h -> Errors.h -> Common.h
* Remove reduncdent #include "ByteBuffer.h" in headers
* Remove redundent #include "Auth/BigNumber.h" in headers
* Avoid multyply data copy at use some now dropped functions in BigNumber.
* Avoid copy fixed byte count from byte arrays with unknown real size created from BigNumber.
* Avoid possible problems for build mangos at different platform or compilers. Author: VladimirMangos.
*[8501] Apply code style and cleanups to some Player functions. Author: VladimirMangos.
*[8502] Disable quests related to specific game events at startup if event not active. Also rename member boolean variable. Author: NoFantasy
*[8506] Add check for IsAutoComplete() in SendPreparedQuest().
For cases where quest is repeatable but has Method!=0, QuestDetails must be sent instead of RequestItems.
Some additional code cleanup. Author: NoFantasy
*[8507] Check amount of spawned pools before decrement to avoid unexpected result. Also rename variable to more meaningful name. Signed-off-by: NoFantasy <nofantasy@nf.no>
Thanks to Stryker and onkelz28!
--HG--
branch : trunk
Diffstat (limited to 'src/shared/Auth')
| -rw-r--r-- | src/shared/Auth/BigNumber.cpp | 15 | ||||
| -rw-r--r-- | src/shared/Auth/BigNumber.h | 3 | ||||
| -rw-r--r-- | src/shared/Auth/Sha1.cpp | 1 | ||||
| -rw-r--r-- | src/shared/Auth/Sha1.h | 3 |
4 files changed, 3 insertions, 19 deletions
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp index 8869d3bb9e5..303687c266c 100644 --- a/src/shared/Auth/BigNumber.cpp +++ b/src/shared/Auth/BigNumber.cpp @@ -188,21 +188,6 @@ uint8 *BigNumber::AsByteArray(int minSize) return _array; } -ByteBuffer BigNumber::AsByteBuffer() -{ - ByteBuffer ret(GetNumBytes()); - ret.append(AsByteArray(), GetNumBytes()); - return ret; -} - -std::vector<uint8> BigNumber::AsByteVector() -{ - std::vector<uint8> ret; - ret.resize(GetNumBytes()); - memcpy(&ret[0], AsByteArray(), GetNumBytes()); - return ret; -} - const char *BigNumber::AsHexStr() { return BN_bn2hex(_bn); diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h index ba116db3965..f1b3a0beda2 100644 --- a/src/shared/Auth/BigNumber.h +++ b/src/shared/Auth/BigNumber.h @@ -22,7 +22,6 @@ #define _AUTH_BIGNUMBER_H #include "Common.h" -#include "ByteBuffer.h" struct bignum_st; @@ -85,8 +84,6 @@ class BigNumber uint32 AsDword(); uint8* AsByteArray(int minSize = 0); - ByteBuffer AsByteBuffer(); - std::vector<uint8> AsByteVector(); const char *AsHexStr(); const char *AsDecStr(); diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp index 8743a14b838..802f1bbcdff 100644 --- a/src/shared/Auth/Sha1.cpp +++ b/src/shared/Auth/Sha1.cpp @@ -19,6 +19,7 @@ */ #include "Auth/Sha1.h" +#include "Auth/BigNumber.h" #include <stdarg.h> Sha1Hash::Sha1Hash() diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h index 099cf99321a..bd2b1afa876 100644 --- a/src/shared/Auth/Sha1.h +++ b/src/shared/Auth/Sha1.h @@ -24,7 +24,8 @@ #include "Common.h" #include <openssl/sha.h> #include <openssl/crypto.h> -#include "Auth/BigNumber.h" + +class BigNumber; class Sha1Hash { |
