diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-12-10 12:39:37 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-04-15 05:53:27 +0200 |
| commit | e17e4e6f0700c7d950e1b2654c217ec8b28ae79e (patch) | |
| tree | 8d78ebf4f2d95c6a18075840f6d02b62b4c6fcad /src/server/game/Guilds | |
| parent | 76b2d37259c8beb3cc1b698eb28fd7e068366724 (diff) | |
Core/Misc: Replace time(NULL) with GameTime::GetGameTime()
(cherry picked from commit 12701cb0c6c45eb105ad449eb9a56e76d84d691e)
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
src/server/game/Battlefield/Battlefield.cpp
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Calendar/CalendarMgr.h
src/server/game/DungeonFinding/LFGQueue.cpp
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Grids/ObjectGridLoader.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/CalendarHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/TicketHandler.cpp
src/server/game/Instances/InstanceSaveMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/game/Tickets/TicketMgr.h
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_gobject.cpp
src/server/scripts/Commands/cs_instance.cpp
src/server/scripts/Commands/cs_list.cpp
src/server/scripts/Northrend/zone_wintergrasp.cpp
src/server/scripts/Spells/spell_item.cpp
Diffstat (limited to 'src/server/game/Guilds')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 18 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.h | 4 | ||||
| -rw-r--r-- | src/server/game/Guilds/GuildFinderMgr.cpp | 3 |
3 files changed, 17 insertions, 8 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 79326a97a38..50caa2fae3e 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -26,6 +26,7 @@ #include "Config.h" #include "DatabaseEnv.h" #include "DB2Stores.h" +#include "GameTime.h" #include "GuildFinderMgr.h" #include "GuildMgr.h" #include "GuildPackets.h" @@ -118,6 +119,8 @@ inline uint32 Guild::LogHolder::GetNextGUID() return m_nextGUID; } +Guild::LogEntry::LogEntry(ObjectGuid::LowType guildId, uint32 guid) : m_guildId(guildId), m_guid(guid), m_timestamp(GameTime::GetGameTime()) { } + // EventLogEntry void Guild::EventLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const { @@ -147,7 +150,7 @@ void Guild::EventLogEntry::WritePacket(WorldPackets::Guild::GuildEventLogQueryRe eventEntry.PlayerGUID = playerGUID; eventEntry.OtherGUID = otherGUID; eventEntry.TransactionType = uint8(m_eventType); - eventEntry.TransactionDate = uint32(::time(nullptr) - m_timestamp); + eventEntry.TransactionDate = uint32(GameTime::GetGameTime() - m_timestamp); eventEntry.RankID = uint8(m_newRank); packet.Entry.push_back(eventEntry); } @@ -190,7 +193,7 @@ void Guild::BankEventLogEntry::WritePacket(WorldPackets::Guild:: GuildBankLogQue WorldPackets::Guild::GuildBankLogEntry bankLogEntry; bankLogEntry.PlayerGUID = logGuid; - bankLogEntry.TimeOffset = int32(time(nullptr) - m_timestamp); + bankLogEntry.TimeOffset = int32(GameTime::GetGameTime() - m_timestamp); bankLogEntry.EntryType = int8(m_eventType); if (hasStack) @@ -517,7 +520,7 @@ Guild::Member::Member(ObjectGuid::LowType guildId, ObjectGuid guid, uint8 rankId m_class(0), _gender(0), m_flags(GUILDMEMBER_STATUS_NONE), - m_logoutTime(::time(nullptr)), + m_logoutTime(GameTime::GetGameTime()), m_accountId(0), m_rankId(rankId), m_bankWithdrawMoney(0), @@ -592,6 +595,11 @@ void Guild::Member::ChangeRank(CharacterDatabaseTransaction& trans, uint8 newRan CharacterDatabase.ExecuteOrAppend(trans, stmt); } +void Guild::Member::UpdateLogoutTime() +{ + m_logoutTime = GameTime::GetGameTime(); +} + void Guild::Member::SaveToDB(CharacterDatabaseTransaction& trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_MEMBER); @@ -662,7 +670,7 @@ float Guild::Member::GetInactiveDays() const { if (IsOnline()) return 0.0f; - return float(::time(nullptr) - GetLogoutTime()) / float(DAY); + return float(GameTime::GetGameTime() - GetLogoutTime()) / float(DAY); } // Decreases amount of slots left for today. @@ -1146,7 +1154,7 @@ bool Guild::Create(Player* pLeader, std::string const& name) m_info = ""; m_motd = "No message set."; m_bankMoney = 0; - m_createdDate = ::time(nullptr); + m_createdDate = GameTime::GetGameTime(); _CreateLogHolders(); TC_LOG_DEBUG("guild", "GUILD: creating guild [%s] for leader %s (%s)", diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 17cb2a3d7f6..bd21c92d733 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -355,7 +355,7 @@ class TC_GAME_API Guild void ChangeRank(CharacterDatabaseTransaction& trans, uint8 newRank); - inline void UpdateLogoutTime() { m_logoutTime = ::time(nullptr); } + inline void UpdateLogoutTime(); inline bool IsRank(uint8 rankId) const { return m_rankId == rankId; } inline bool IsRankNotLower(uint8 rankId) const { return m_rankId <= rankId; } inline bool IsSamePlayer(ObjectGuid guid) const { return m_guid == guid; } @@ -401,7 +401,7 @@ class TC_GAME_API Guild class LogEntry { public: - LogEntry(ObjectGuid::LowType guildId, uint32 guid) : m_guildId(guildId), m_guid(guid), m_timestamp(::time(nullptr)) { } + LogEntry(ObjectGuid::LowType guildId, uint32 guid); LogEntry(ObjectGuid::LowType guildId, uint32 guid, time_t timestamp) : m_guildId(guildId), m_guid(guid), m_timestamp(timestamp) { } virtual ~LogEntry() { } diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index a6ff56d015e..4628bff0555 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -18,6 +18,7 @@ #include "GuildFinderMgr.h" #include "DatabaseEnv.h" #include "DB2Stores.h" +#include "GameTime.h" #include "Guild.h" #include "GuildMgr.h" #include "GuildFinderPackets.h" @@ -26,7 +27,7 @@ #include "Player.h" #include "World.h" -MembershipRequest::MembershipRequest() : _availability(0), _classRoles(0), _interests(0), _time(time(nullptr)) +MembershipRequest::MembershipRequest() : _availability(0), _classRoles(0), _interests(0), _time(GameTime::GetGameTime()) { } |
