diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-09-12 19:17:31 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2020-09-12 19:40:09 +0200 |
| commit | 59be657ca267667b3cbeb1f34d47df0382e97f53 (patch) | |
| tree | bd5c30616bf0321243a53afab40dcb5615f25e40 /src/server/game | |
| parent | 243524b39cd430035f96d4d55ad265d4cb6a0b55 (diff) | |
Core/Misc: Fix some static analysis warnings exposed after 6b8f3d0.
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Calendar/CalendarMgr.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Calendar/CalendarMgr.h | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 368176ee34f..9d14db8cd81 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -144,12 +144,6 @@ void CalendarMgr::AddEvent(CalendarEvent* calendarEvent, CalendarSendEventType s SendCalendarEvent(calendarEvent->GetCreatorGUID(), *calendarEvent, sendType); } -void CalendarMgr::AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite) -{ - CharacterDatabaseTransaction dummy; - AddInvite(calendarEvent, invite, dummy); -} - void CalendarMgr::AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite, CharacterDatabaseTransaction trans) { if (!calendarEvent->IsGuildAnnouncement()) @@ -269,12 +263,6 @@ void CalendarMgr::UpdateEvent(CalendarEvent* calendarEvent) CharacterDatabase.Execute(stmt); } -void CalendarMgr::UpdateInvite(CalendarInvite* invite) -{ - CharacterDatabaseTransaction dummy; - UpdateInvite(invite, dummy); -} - void CalendarMgr::UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_CALENDAR_INVITE); diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index 0abad29677c..056218217cb 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -322,11 +322,9 @@ class TC_GAME_API CalendarMgr void RemoveEvent(CalendarEvent* calendarEvent, ObjectGuid remover); void UpdateEvent(CalendarEvent* calendarEvent); - void AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite); - void AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite, CharacterDatabaseTransaction trans); + void AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite, CharacterDatabaseTransaction trans = nullptr); void RemoveInvite(uint64 inviteId, uint64 eventId, ObjectGuid remover); - void UpdateInvite(CalendarInvite* invite); - void UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction trans); + void UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction trans = nullptr); void RemoveAllPlayerEventsAndInvites(ObjectGuid guid); void RemovePlayerGuildEventsAndSignups(ObjectGuid guid, ObjectGuid::LowType guildId); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b9d48837489..850f7aa554a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4474,7 +4474,7 @@ void Player::DeleteOldCharacters(uint32 keepDays) TC_LOG_INFO("entities.player", "Player::DeleteOldCharacters: Deleting all characters which have been deleted %u days before...", keepDays); CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_OLD_CHARS); - stmt->setUInt32(0, uint32(GameTime::GetGameTime() - time_t(keepDays * DAY))); + stmt->setUInt32(0, static_cast<uint32>(GameTime::GetGameTime() - static_cast<time_t>(keepDays) * DAY)); PreparedQueryResult result = CharacterDatabase.Query(stmt); if (result) |
