diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-11-21 12:25:22 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-12-02 15:57:03 +0100 |
| commit | 45a5b6a9f04d2f605e7141b8da6e9cfa24711e07 (patch) | |
| tree | 5d0f5890d888610ad4cf598db9c47e831a41eb35 /src/server/shared | |
| parent | 9daaa99ed49fc4ed63007bc932a411d33b5b7ef8 (diff) | |
Core/Calendar: Implement different timezone support for ingame calendar
Closes #8390
Closes #29427
(cherry picked from commit b888b1b09f71a8b8b4a9d45c804a1f164fb65ac3)
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Packets/ByteBuffer.cpp | 23 | ||||
| -rw-r--r-- | src/server/shared/Packets/ByteBuffer.h | 10 | ||||
| -rw-r--r-- | src/server/shared/Realm/RealmList.h | 1 |
3 files changed, 1 insertions, 33 deletions
diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp index aff903f4846..2a784027dc3 100644 --- a/src/server/shared/Packets/ByteBuffer.cpp +++ b/src/server/shared/Packets/ByteBuffer.cpp @@ -24,7 +24,6 @@ #include <utf8.h> #include <sstream> #include <cmath> -#include <ctime> ByteBuffer::ByteBuffer(MessageBuffer&& buffer) : _rpos(0), _wpos(0), _storage(buffer.Move()) { @@ -90,21 +89,6 @@ std::string ByteBuffer::ReadCString(bool requireValidUtf8 /*= true*/) return value; } -uint32 ByteBuffer::ReadPackedTime() -{ - uint32 packedDate = read<uint32>(); - tm lt = tm(); - - lt.tm_min = packedDate & 0x3F; - lt.tm_hour = (packedDate >> 6) & 0x1F; - //lt.tm_wday = (packedDate >> 11) & 7; - lt.tm_mday = ((packedDate >> 14) & 0x3F) + 1; - lt.tm_mon = (packedDate >> 20) & 0xF; - lt.tm_year = ((packedDate >> 24) & 0x1F) + 100; - - return uint32(mktime(<)); -} - void ByteBuffer::append(uint8 const* src, size_t cnt) { ASSERT(src, "Attempted to put a NULL-pointer in ByteBuffer (pos: " SZFMTD " size: " SZFMTD ")", _wpos, size()); @@ -130,13 +114,6 @@ void ByteBuffer::append(uint8 const* src, size_t cnt) _wpos = newSize; } -void ByteBuffer::AppendPackedTime(time_t time) -{ - tm lt; - localtime_r(&time, <); - append<uint32>((lt.tm_year - 100) << 24 | lt.tm_mon << 20 | (lt.tm_mday - 1) << 14 | lt.tm_wday << 11 | lt.tm_hour << 6 | lt.tm_min); -} - void ByteBuffer::put(size_t pos, uint8 const* src, size_t cnt) { ASSERT(pos + cnt <= size(), "Attempted to put value with size: " SZFMTD " in ByteBuffer (pos: " SZFMTD " size: " SZFMTD ")", cnt, pos, size()); diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index aa387d0842b..e19e89ede22 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -392,14 +392,6 @@ class TC_SHARED_API ByteBuffer std::string ReadCString(bool requireValidUtf8 = true); - uint32 ReadPackedTime(); - - ByteBuffer& ReadPackedTime(uint32& time) - { - time = ReadPackedTime(); - return *this; - } - uint8* contents() { if (_storage.empty()) @@ -488,8 +480,6 @@ class TC_SHARED_API ByteBuffer append(packGUID, size); } - void AppendPackedTime(time_t time); - void put(size_t pos, const uint8 *src, size_t cnt); void print_storage() const; diff --git a/src/server/shared/Realm/RealmList.h b/src/server/shared/Realm/RealmList.h index b5ef9c33b7b..056472533e2 100644 --- a/src/server/shared/Realm/RealmList.h +++ b/src/server/shared/Realm/RealmList.h @@ -19,6 +19,7 @@ #define _REALMLIST_H #include "Define.h" +#include "Duration.h" #include "Realm.h" #include <array> #include <map> |
