diff options
author | Treeston <treeston.mmoc@gmail.com> | 2020-09-12 19:17:31 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-02-05 23:05:14 +0100 |
commit | 7d0586812a8e7d17f901d9e01af424c4a4ff6bc7 (patch) | |
tree | 24e0ef752dcbda04a5d1fe7c33f47cbdefec3f92 | |
parent | 0e22b5763fcc658fc0dfe648ee575d03af625c71 (diff) |
Core/Misc: Fix some static analysis warnings exposed after 6b8f3d0.
(cherry picked from commit 59be657ca267667b3cbeb1f34d47df0382e97f53)
-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 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 3 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_tele.cpp | 6 |
5 files changed, 6 insertions, 23 deletions
diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index a8f8305c9b6..143bd0f4dd7 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->GetOwnerGUID(), *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() && calendarEvent->GetOwnerGUID() != invite->GetInviteeGUID()) @@ -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 81505f84cb8..e9119fc510f 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -325,11 +325,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 0da71128892..725443db81b 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4221,7 +4221,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) diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 49eb1b27807..d97fafaa23d 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -593,14 +593,13 @@ public: handler->PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE)); // in point where GM stay - CharacterDatabaseTransaction dummy; Player::SavePositionInDB(WorldLocation(_player->GetMapId(), _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetOrientation()), _player->GetZoneId(), - targetGuid, dummy); + targetGuid, nullptr); } return true; diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index de6812816d3..4d454465df8 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -132,8 +132,7 @@ public: WorldLocation loc(fieldsDB[0].GetUInt16(), fieldsDB[2].GetFloat(), fieldsDB[3].GetFloat(), fieldsDB[4].GetFloat(), 0.0f); uint32 zoneId = fieldsDB[1].GetUInt16(); - CharacterDatabaseTransaction dummy; - Player::SavePositionInDB(loc, zoneId, player->GetGUID(), dummy); + Player::SavePositionInDB(loc, zoneId, player->GetGUID(), nullptr); } } @@ -179,9 +178,8 @@ public: handler->PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE), tele->name.c_str()); - CharacterDatabaseTransaction dummy; Player::SavePositionInDB(WorldLocation(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation), - sMapMgr->GetZoneId(PhasingHandler::GetEmptyPhaseShift(), tele->mapId, tele->position_x, tele->position_y, tele->position_z), player->GetGUID(), dummy); + sMapMgr->GetZoneId(PhasingHandler::GetEmptyPhaseShift(), tele->mapId, tele->position_x, tele->position_y, tele->position_z), player->GetGUID(), nullptr); } return true; |