diff options
Diffstat (limited to 'src/server')
38 files changed, 194 insertions, 194 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 6affb4cb5ed..2444511cafc 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -316,7 +316,7 @@ void PlayerAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Pre } } -void PlayerAchievementMgr::SaveToDB(CharacterDatabaseTransaction& trans) +void PlayerAchievementMgr::SaveToDB(CharacterDatabaseTransaction trans) { if (!_completedAchievements.empty()) { @@ -802,7 +802,7 @@ void GuildAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Prep } } -void GuildAchievementMgr::SaveToDB(CharacterDatabaseTransaction& trans) +void GuildAchievementMgr::SaveToDB(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; std::ostringstream guidstr; diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 6c87792a38d..cb3a63f6803 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -82,7 +82,7 @@ public: static void DeleteFromDB(ObjectGuid const& guid); void LoadFromDB(PreparedQueryResult achievementResult, PreparedQueryResult criteriaResult); - void SaveToDB(CharacterDatabaseTransaction& trans); + void SaveToDB(CharacterDatabaseTransaction trans); void ResetCriteria(CriteriaFailEvent failEvent, int32 failAsset, bool evenIfCriteriaComplete = false); @@ -118,7 +118,7 @@ public: static void DeleteFromDB(ObjectGuid const& guid); void LoadFromDB(PreparedQueryResult achievementResult, PreparedQueryResult criteriaResult); - void SaveToDB(CharacterDatabaseTransaction& trans); + void SaveToDB(CharacterDatabaseTransaction trans); void SendAllData(Player const* receiver) const override; void SendAchievementInfo(Player* receiver, uint32 achievementId = 0) const; diff --git a/src/server/game/BattlePets/BattlePetMgr.cpp b/src/server/game/BattlePets/BattlePetMgr.cpp index 57d8d4ea0de..559ffd6f95c 100644 --- a/src/server/game/BattlePets/BattlePetMgr.cpp +++ b/src/server/game/BattlePets/BattlePetMgr.cpp @@ -307,7 +307,7 @@ void BattlePetMgr::LoadFromDB(PreparedQueryResult pets, PreparedQueryResult slot } } -void BattlePetMgr::SaveToDB(LoginDatabaseTransaction& trans) +void BattlePetMgr::SaveToDB(LoginDatabaseTransaction trans) { LoginDatabasePreparedStatement* stmt = nullptr; diff --git a/src/server/game/BattlePets/BattlePetMgr.h b/src/server/game/BattlePets/BattlePetMgr.h index d6c0ca40e0a..33d2ddbb444 100644 --- a/src/server/game/BattlePets/BattlePetMgr.h +++ b/src/server/game/BattlePets/BattlePetMgr.h @@ -156,7 +156,7 @@ public: static uint32 SelectPetDisplay(BattlePetSpeciesEntry const* speciesEntry); void LoadFromDB(PreparedQueryResult pets, PreparedQueryResult slots); - void SaveToDB(LoginDatabaseTransaction& trans); + void SaveToDB(LoginDatabaseTransaction trans); BattlePet* GetPet(ObjectGuid guid); void AddPet(uint32 species, uint32 display, uint16 breed, BattlePetBreedQuality quality, uint16 level = 1); diff --git a/src/server/game/BlackMarket/BlackMarketMgr.cpp b/src/server/game/BlackMarket/BlackMarketMgr.cpp index f543f14bfe1..8faf1f434cc 100644 --- a/src/server/game/BlackMarket/BlackMarketMgr.cpp +++ b/src/server/game/BlackMarket/BlackMarketMgr.cpp @@ -260,7 +260,7 @@ void BlackMarketMgr::AddTemplate(BlackMarketTemplate* templ) _templates[templ->MarketID] = templ; } -void BlackMarketMgr::SendAuctionWonMail(BlackMarketEntry* entry, CharacterDatabaseTransaction& trans) +void BlackMarketMgr::SendAuctionWonMail(BlackMarketEntry* entry, CharacterDatabaseTransaction trans) { // Mail already sent if (entry->GetMailSent()) @@ -320,7 +320,7 @@ void BlackMarketMgr::SendAuctionWonMail(BlackMarketEntry* entry, CharacterDataba entry->MailSent(); } -void BlackMarketMgr::SendAuctionOutbidMail(BlackMarketEntry* entry, CharacterDatabaseTransaction& trans) +void BlackMarketMgr::SendAuctionOutbidMail(BlackMarketEntry* entry, CharacterDatabaseTransaction trans) { ObjectGuid oldBidder_guid = ObjectGuid::Create<HighGuid::Player>(entry->GetBidder()); Player* oldBidder = ObjectAccessor::FindConnectedPlayer(oldBidder_guid); @@ -447,7 +447,7 @@ bool BlackMarketEntry::LoadFromDB(Field* fields) return true; } -void BlackMarketEntry::SaveToDB(CharacterDatabaseTransaction& trans) const +void BlackMarketEntry::SaveToDB(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_BLACKMARKET_AUCTIONS); @@ -460,7 +460,7 @@ void BlackMarketEntry::SaveToDB(CharacterDatabaseTransaction& trans) const trans->Append(stmt); } -void BlackMarketEntry::DeleteFromDB(CharacterDatabaseTransaction& trans) const +void BlackMarketEntry::DeleteFromDB(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_BLACKMARKET_AUCTIONS); stmt->setInt32(0, _marketId); @@ -481,7 +481,7 @@ bool BlackMarketEntry::ValidateBid(uint64 bid) const return true; } -void BlackMarketEntry::PlaceBid(uint64 bid, Player* player, CharacterDatabaseTransaction& trans) //Updated +void BlackMarketEntry::PlaceBid(uint64 bid, Player* player, CharacterDatabaseTransaction trans) //Updated { if (bid < _currentBid) return; diff --git a/src/server/game/BlackMarket/BlackMarketMgr.h b/src/server/game/BlackMarket/BlackMarketMgr.h index 5bbdce7a1af..888222513c0 100644 --- a/src/server/game/BlackMarket/BlackMarketMgr.h +++ b/src/server/game/BlackMarket/BlackMarketMgr.h @@ -94,13 +94,13 @@ public: time_t GetExpirationTime() const; bool IsCompleted() const; - void DeleteFromDB(CharacterDatabaseTransaction& trans) const; - void SaveToDB(CharacterDatabaseTransaction& trans) const; + void DeleteFromDB(CharacterDatabaseTransaction trans) const; + void SaveToDB(CharacterDatabaseTransaction trans) const; bool LoadFromDB(Field* fields); uint64 GetMinIncrement() const { return (_currentBid / 20) - ((_currentBid / 20) % GOLD); } //5% increase every bid (has to be round gold value) bool ValidateBid(uint64 bid) const; - void PlaceBid(uint64 bid, Player* player, CharacterDatabaseTransaction& trans); + void PlaceBid(uint64 bid, Player* player, CharacterDatabaseTransaction trans); std::string BuildAuctionMailSubject(BMAHMailAuctionAnswers response) const; std::string BuildAuctionMailBody(); @@ -147,8 +147,8 @@ class TC_GAME_API BlackMarketMgr void AddAuction(BlackMarketEntry* auction); void AddTemplate(BlackMarketTemplate* templ); - void SendAuctionWonMail(BlackMarketEntry* entry, CharacterDatabaseTransaction& trans); - void SendAuctionOutbidMail(BlackMarketEntry* entry, CharacterDatabaseTransaction& trans); // Call before incrementing bid + void SendAuctionWonMail(BlackMarketEntry* entry, CharacterDatabaseTransaction trans); + void SendAuctionOutbidMail(BlackMarketEntry* entry, CharacterDatabaseTransaction trans); // Call before incrementing bid private: BlackMarketEntryMap _auctions; diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index f035ac9b7e9..a8f8305c9b6 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -150,7 +150,7 @@ void CalendarMgr::AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite AddInvite(calendarEvent, invite, dummy); } -void CalendarMgr::AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite, CharacterDatabaseTransaction& trans) +void CalendarMgr::AddInvite(CalendarEvent* calendarEvent, CalendarInvite* invite, CharacterDatabaseTransaction trans) { if (!calendarEvent->IsGuildAnnouncement() && calendarEvent->GetOwnerGUID() != invite->GetInviteeGUID()) SendCalendarEventInvite(*invite); @@ -275,7 +275,7 @@ void CalendarMgr::UpdateInvite(CalendarInvite* invite) UpdateInvite(invite, dummy); } -void CalendarMgr::UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction& trans) +void CalendarMgr::UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_CALENDAR_INVITE); stmt->setUInt64(0, invite->GetInviteId()); diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index 2d564b8f32f..81505f84cb8 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -326,10 +326,10 @@ class TC_GAME_API CalendarMgr 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); void RemoveInvite(uint64 inviteId, uint64 eventId, ObjectGuid remover); void UpdateInvite(CalendarInvite* invite); - void UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction& trans); + void UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransaction trans); void RemoveAllPlayerEventsAndInvites(ObjectGuid guid); void RemovePlayerGuildEventsAndSignups(ObjectGuid guid, ObjectGuid::LowType guildId); diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index c81dd34acc1..75e5142e21c 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -146,12 +146,12 @@ void Corpse::SaveToDB() CharacterDatabase.CommitTransaction(trans); } -void Corpse::DeleteFromDB(CharacterDatabaseTransaction& trans) +void Corpse::DeleteFromDB(CharacterDatabaseTransaction trans) { DeleteFromDB(GetOwnerGUID(), trans); } -void Corpse::DeleteFromDB(ObjectGuid const& ownerGuid, CharacterDatabaseTransaction& trans) +void Corpse::DeleteFromDB(ObjectGuid const& ownerGuid, CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CORPSE); stmt->setUInt64(0, ownerGuid.GetCounter()); diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index 22636982bcf..fed3211b4c4 100644 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -71,8 +71,8 @@ class TC_GAME_API Corpse : public WorldObject, public GridObject<Corpse> void SaveToDB(); bool LoadCorpseFromDB(ObjectGuid::LowType guid, Field* fields); - void DeleteFromDB(CharacterDatabaseTransaction& trans); - static void DeleteFromDB(ObjectGuid const& ownerGuid, CharacterDatabaseTransaction& trans); + void DeleteFromDB(CharacterDatabaseTransaction trans); + static void DeleteFromDB(ObjectGuid const& ownerGuid, CharacterDatabaseTransaction trans); void AddCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { SetUpdateFieldFlagValue(m_values.ModifyValue(&Corpse::m_corpseData).ModifyValue(&UF::CorpseData::DynamicFlags), dynamicFlags); } void RemoveCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(&Corpse::m_corpseData).ModifyValue(&UF::CorpseData::DynamicFlags), dynamicFlags); } diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp b/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp index ec5ccc63223..8584a18a679 100644 --- a/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp +++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.cpp @@ -39,7 +39,7 @@ bool AzeriteEmpoweredItem::Create(ObjectGuid::LowType guidlow, uint32 itemId, It return true; } -void AzeriteEmpoweredItem::SaveToDB(CharacterDatabaseTransaction& trans) +void AzeriteEmpoweredItem::SaveToDB(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE_AZERITE_EMPOWERED); stmt->setUInt64(0, GetGUID().GetCounter()); @@ -98,14 +98,14 @@ void AzeriteEmpoweredItem::LoadAzeriteEmpoweredItemData(Player const* owner, Aze } } -void AzeriteEmpoweredItem::DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid) +void AzeriteEmpoweredItem::DeleteFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE_AZERITE_EMPOWERED); stmt->setUInt64(0, itemGuid); CharacterDatabase.ExecuteOrAppend(trans, stmt); } -void AzeriteEmpoweredItem::DeleteFromDB(CharacterDatabaseTransaction& trans) +void AzeriteEmpoweredItem::DeleteFromDB(CharacterDatabaseTransaction trans) { AzeriteEmpoweredItem::DeleteFromDB(trans, GetGUID().GetCounter()); Item::DeleteFromDB(trans); diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.h b/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.h index a0c66f2f43d..2e0ed093be4 100644 --- a/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.h +++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteEmpoweredItem.h @@ -27,10 +27,10 @@ public: bool Create(ObjectGuid::LowType guidlow, uint32 itemId, ItemContext context, Player const* owner) override; - void SaveToDB(CharacterDatabaseTransaction& trans) override; + void SaveToDB(CharacterDatabaseTransaction trans) override; void LoadAzeriteEmpoweredItemData(Player const* owner, AzeriteEmpoweredItemData& azeriteEmpoweredItem); - static void DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid); - void DeleteFromDB(CharacterDatabaseTransaction& trans) override; + static void DeleteFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid); + void DeleteFromDB(CharacterDatabaseTransaction trans) override; uint32 GetRequiredAzeriteLevelForTier(uint32 tier) const; int32 GetTierForAzeritePower(Classes playerClass, int32 azeritePowerId) const; diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp index 293e5485689..b6f5e2b7f65 100644 --- a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp +++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.cpp @@ -45,7 +45,7 @@ bool AzeriteItem::Create(ObjectGuid::LowType guidlow, uint32 itemId, ItemContext return true; } -void AzeriteItem::SaveToDB(CharacterDatabaseTransaction& trans) +void AzeriteItem::SaveToDB(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE_AZERITE); stmt->setUInt64(0, GetGUID().GetCounter()); @@ -189,7 +189,7 @@ void AzeriteItem::LoadAzeriteItemData(Player const* owner, AzeriteItemData& azer } } -void AzeriteItem::DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid) +void AzeriteItem::DeleteFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE_AZERITE); stmt->setUInt64(0, itemGuid); @@ -204,7 +204,7 @@ void AzeriteItem::DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid:: CharacterDatabase.ExecuteOrAppend(trans, stmt); } -void AzeriteItem::DeleteFromDB(CharacterDatabaseTransaction& trans) +void AzeriteItem::DeleteFromDB(CharacterDatabaseTransaction trans) { AzeriteItem::DeleteFromDB(trans, GetGUID().GetCounter()); Item::DeleteFromDB(trans); diff --git a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.h b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.h index e986abf27cd..34fff676050 100644 --- a/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.h +++ b/src/server/game/Entities/Item/AzeriteItem/AzeriteItem.h @@ -33,10 +33,10 @@ public: bool Create(ObjectGuid::LowType guidlow, uint32 itemId, ItemContext context, Player const* owner) override; - void SaveToDB(CharacterDatabaseTransaction& trans) override; + void SaveToDB(CharacterDatabaseTransaction trans) override; void LoadAzeriteItemData(Player const* owner, AzeriteItemData& azeriteItem); - static void DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid); - void DeleteFromDB(CharacterDatabaseTransaction& trans) override; + static void DeleteFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid); + void DeleteFromDB(CharacterDatabaseTransaction trans) override; uint32 GetLevel() const { return m_azeriteItemData->Level; } uint32 GetEffectiveLevel() const diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index 8e4ef213eb8..6629182b47b 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -105,7 +105,7 @@ bool Bag::Create(ObjectGuid::LowType guidlow, uint32 itemid, ItemContext context return true; } -void Bag::SaveToDB(CharacterDatabaseTransaction& trans) +void Bag::SaveToDB(CharacterDatabaseTransaction trans) { Item::SaveToDB(trans); } @@ -128,7 +128,7 @@ bool Bag::LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fie return true; } -void Bag::DeleteFromDB(CharacterDatabaseTransaction& trans) +void Bag::DeleteFromDB(CharacterDatabaseTransaction trans) { for (uint8 i = 0; i < MAX_BAG_SIZE; ++i) if (m_bagslot[i]) diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h index 574a57f323f..8f02e5aff61 100644 --- a/src/server/game/Entities/Item/Container/Bag.h +++ b/src/server/game/Entities/Item/Container/Bag.h @@ -46,11 +46,11 @@ class TC_GAME_API Bag : public Item // DB operations // overwrite virtual Item::SaveToDB - void SaveToDB(CharacterDatabaseTransaction& trans) override; + void SaveToDB(CharacterDatabaseTransaction trans) override; // overwrite virtual Item::LoadFromDB bool LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fields, uint32 entry) override; // overwrite virtual Item::DeleteFromDB - void DeleteFromDB(CharacterDatabaseTransaction& trans) override; + void DeleteFromDB(CharacterDatabaseTransaction trans) override; protected: void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override; diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index a137f4219fb..6c04eb0fddd 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -551,7 +551,7 @@ void Item::UpdateDuration(Player* owner, uint32 diff) SetState(ITEM_CHANGED, owner); // save new time in database } -void Item::SaveToDB(CharacterDatabaseTransaction& trans) +void Item::SaveToDB(CharacterDatabaseTransaction trans) { bool isInTransaction = bool(trans); if (!isInTransaction) @@ -1078,7 +1078,7 @@ void Item::CheckArtifactRelicSlotUnlock(Player const* owner) } /*static*/ -void Item::DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid) +void Item::DeleteFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE); stmt->setUInt64(0, itemGuid); @@ -1109,7 +1109,7 @@ void Item::DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType CharacterDatabase.ExecuteOrAppend(trans, stmt); } -void Item::DeleteFromDB(CharacterDatabaseTransaction& trans) +void Item::DeleteFromDB(CharacterDatabaseTransaction trans) { DeleteFromDB(trans, GetGUID().GetCounter()); @@ -1119,14 +1119,14 @@ void Item::DeleteFromDB(CharacterDatabaseTransaction& trans) } /*static*/ -void Item::DeleteFromInventoryDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid) +void Item::DeleteFromInventoryDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_INVENTORY_BY_ITEM); stmt->setUInt64(0, itemGuid); trans->Append(stmt); } -void Item::DeleteFromInventoryDB(CharacterDatabaseTransaction& trans) +void Item::DeleteFromInventoryDB(CharacterDatabaseTransaction trans) { DeleteFromInventoryDB(trans, GetGUID().GetCounter()); } diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index d04676920eb..f33b1f00a75 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -217,7 +217,7 @@ class TC_GAME_API Item : public Object bool IsBattlenetAccountBound() const { return GetTemplate()->HasFlag(ITEM_FLAG2_BNET_ACCOUNT_TRADE_OK); } bool IsBindedNotWith(Player const* player) const; bool IsBoundByEnchant() const; - virtual void SaveToDB(CharacterDatabaseTransaction& trans); + virtual void SaveToDB(CharacterDatabaseTransaction trans); virtual bool LoadFromDB(ObjectGuid::LowType guid, ObjectGuid ownerGuid, Field* fields, uint32 entry); void LoadArtifactData(Player const* owner, uint64 xp, uint32 artifactAppearanceId, uint32 artifactTier, std::vector<ArtifactPowerData>& powers); // must be called after LoadFromDB to have gems (relics) initialized void CheckArtifactRelicSlotUnlock(Player const* owner); @@ -226,11 +226,11 @@ class TC_GAME_API Item : public Object void SetBonuses(std::vector<int32> bonusListIDs); void ClearBonuses(); - static void DeleteFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid); - virtual void DeleteFromDB(CharacterDatabaseTransaction& trans); - static void DeleteFromInventoryDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType itemGuid); + static void DeleteFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid); + virtual void DeleteFromDB(CharacterDatabaseTransaction trans); + static void DeleteFromInventoryDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType itemGuid); - void DeleteFromInventoryDB(CharacterDatabaseTransaction& trans); + void DeleteFromInventoryDB(CharacterDatabaseTransaction trans); void SaveRefundDataToDB(); void DeleteRefundDataFromDB(CharacterDatabaseTransaction* trans); diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 88de7a45c84..de93bf415ff 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1135,7 +1135,7 @@ void Pet::_LoadSpells(PreparedQueryResult result) } } -void Pet::_SaveSpells(CharacterDatabaseTransaction& trans) +void Pet::_SaveSpells(CharacterDatabaseTransaction trans) { for (PetSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end(); itr = next) { @@ -1294,7 +1294,7 @@ void Pet::_LoadAuras(PreparedQueryResult auraResult, PreparedQueryResult effectR } } -void Pet::_SaveAuras(CharacterDatabaseTransaction& trans) +void Pet::_SaveAuras(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PET_AURA_EFFECTS); stmt->setUInt32(0, m_charmInfo->GetPetNumber()); diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 8dc3da1d1ea..2a0dfde8466 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -115,9 +115,9 @@ class TC_GAME_API Pet : public Guardian bool IsPetAura(Aura const* aura); void _LoadAuras(PreparedQueryResult auraResult, PreparedQueryResult effectResult, uint32 timediff); - void _SaveAuras(CharacterDatabaseTransaction& trans); + void _SaveAuras(CharacterDatabaseTransaction trans); void _LoadSpells(PreparedQueryResult result); - void _SaveSpells(CharacterDatabaseTransaction& trans); + void _SaveSpells(CharacterDatabaseTransaction trans); bool addSpell(uint32 spellId, ActiveStates active = ACT_DECIDE, PetSpellState state = PETSPELL_NEW, PetSpellType type = PETSPELL_NORMAL); bool learnSpell(uint32 spell_id); diff --git a/src/server/game/Entities/Player/CollectionMgr.cpp b/src/server/game/Entities/Player/CollectionMgr.cpp index fc459f5ea06..c7d2966ea0f 100644 --- a/src/server/game/Entities/Player/CollectionMgr.cpp +++ b/src/server/game/Entities/Player/CollectionMgr.cpp @@ -123,7 +123,7 @@ void CollectionMgr::LoadAccountToys(PreparedQueryResult result) } while (result->NextRow()); } -void CollectionMgr::SaveAccountToys(LoginDatabaseTransaction& trans) +void CollectionMgr::SaveAccountToys(LoginDatabaseTransaction trans) { LoginDatabasePreparedStatement* stmt = nullptr; for (auto const& toy : _toys) @@ -201,7 +201,7 @@ void CollectionMgr::LoadAccountHeirlooms(PreparedQueryResult result) } while (result->NextRow()); } -void CollectionMgr::SaveAccountHeirlooms(LoginDatabaseTransaction& trans) +void CollectionMgr::SaveAccountHeirlooms(LoginDatabaseTransaction trans) { LoginDatabasePreparedStatement* stmt = nullptr; for (auto const& heirloom : _heirlooms) @@ -362,7 +362,7 @@ void CollectionMgr::LoadAccountMounts(PreparedQueryResult result) } while (result->NextRow()); } -void CollectionMgr::SaveAccountMounts(LoginDatabaseTransaction& trans) +void CollectionMgr::SaveAccountMounts(LoginDatabaseTransaction trans) { for (auto const& mount : _mounts) { @@ -528,7 +528,7 @@ void CollectionMgr::LoadAccountItemAppearances(PreparedQueryResult knownAppearan } } -void CollectionMgr::SaveAccountItemAppearances(LoginDatabaseTransaction& trans) +void CollectionMgr::SaveAccountItemAppearances(LoginDatabaseTransaction trans) { uint16 blockIndex = 0; boost::to_block_range(*_appearances, DynamicBitsetBlockOutputIterator([this, &blockIndex, trans](uint32 blockValue) diff --git a/src/server/game/Entities/Player/CollectionMgr.h b/src/server/game/Entities/Player/CollectionMgr.h index fbe60792992..7c3c5d9c014 100644 --- a/src/server/game/Entities/Player/CollectionMgr.h +++ b/src/server/game/Entities/Player/CollectionMgr.h @@ -90,7 +90,7 @@ public: // Account-wide toys void LoadToys(); void LoadAccountToys(PreparedQueryResult result); - void SaveAccountToys(LoginDatabaseTransaction& trans); + void SaveAccountToys(LoginDatabaseTransaction trans); void ToySetFavorite(uint32 itemId, bool favorite); void ToyClearFanfare(uint32 itemId); @@ -105,7 +105,7 @@ public: // Account-wide heirlooms void LoadHeirlooms(); void LoadAccountHeirlooms(PreparedQueryResult result); - void SaveAccountHeirlooms(LoginDatabaseTransaction& trans); + void SaveAccountHeirlooms(LoginDatabaseTransaction trans); void AddHeirloom(uint32 itemId, uint32 flags); void UpgradeHeirloom(uint32 itemId, int32 castItem); void CheckHeirloomUpgrades(Item* item); @@ -117,7 +117,7 @@ public: // Account-wide mounts void LoadMounts(); void LoadAccountMounts(PreparedQueryResult result); - void SaveAccountMounts(LoginDatabaseTransaction& trans); + void SaveAccountMounts(LoginDatabaseTransaction trans); bool AddMount(uint32 spellId, MountStatusFlags flags, bool factionMount = false, bool learned = false); void MountSetFavorite(uint32 spellId, bool favorite); void SendSingleMountUpdate(std::pair<uint32, MountStatusFlags> mount); @@ -126,7 +126,7 @@ public: // Appearances void LoadItemAppearances(); void LoadAccountItemAppearances(PreparedQueryResult knownAppearances, PreparedQueryResult favoriteAppearances); - void SaveAccountItemAppearances(LoginDatabaseTransaction& trans); + void SaveAccountItemAppearances(LoginDatabaseTransaction trans); void AddItemAppearance(Item* item); void AddItemAppearance(uint32 itemId, uint32 appearanceModId = 0); void AddTransmogSet(uint32 transmogSetId); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b782c3ad2dc..f2171820d40 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4417,7 +4417,7 @@ void Player::KillPlayer() UpdateObjectVisibility(); } -void Player::OfflineResurrect(ObjectGuid const& guid, CharacterDatabaseTransaction& trans) +void Player::OfflineResurrect(ObjectGuid const& guid, CharacterDatabaseTransaction trans) { Corpse::DeleteFromDB(guid, trans); CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG); @@ -6764,7 +6764,7 @@ void Player::_LoadCurrency(PreparedQueryResult result) } while (result->NextRow()); } -void Player::_SaveCurrency(CharacterDatabaseTransaction& trans) +void Player::_SaveCurrency(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; for (PlayerCurrenciesMap::iterator itr = _currencyStorage.begin(); itr != _currencyStorage.end(); ++itr) @@ -19169,7 +19169,7 @@ void Player::_LoadVoidStorage(PreparedQueryResult result) while (result->NextRow()); } -Item* Player::_LoadItem(CharacterDatabaseTransaction& trans, uint32 zoneId, uint32 timeDiff, Field* fields) +Item* Player::_LoadItem(CharacterDatabaseTransaction trans, uint32 zoneId, uint32 timeDiff, Field* fields) { Item* item = nullptr; ObjectGuid::LowType itemGuid = fields[0].GetUInt64(); @@ -20744,14 +20744,14 @@ void Player::SaveToDB(LoginDatabaseTransaction loginTransaction, CharacterDataba } // fast save function for item/money cheating preventing - save only inventory and money state -void Player::SaveInventoryAndGoldToDB(CharacterDatabaseTransaction& trans) +void Player::SaveInventoryAndGoldToDB(CharacterDatabaseTransaction trans) { _SaveInventory(trans); _SaveCurrency(trans); SaveGoldToDB(trans); } -void Player::SaveGoldToDB(CharacterDatabaseTransaction& trans) const +void Player::SaveGoldToDB(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHAR_MONEY); stmt->setUInt64(0, GetMoney()); @@ -20792,7 +20792,7 @@ void Player::_SaveCustomizations(CharacterDatabaseTransaction trans) SavePlayerCustomizations(trans, GetGUID().GetCounter(), Trinity::Containers::MakeIteratorPair(m_playerData->Customizations.begin(), m_playerData->Customizations.end())); } -void Player::_SaveActions(CharacterDatabaseTransaction& trans) +void Player::_SaveActions(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; @@ -20840,7 +20840,7 @@ void Player::_SaveActions(CharacterDatabaseTransaction& trans) } } -void Player::_SaveAuras(CharacterDatabaseTransaction& trans) +void Player::_SaveAuras(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_AURA_EFFECT); stmt->setUInt64(0, GetGUID().GetCounter()); @@ -20897,7 +20897,7 @@ void Player::_SaveAuras(CharacterDatabaseTransaction& trans) } } -void Player::_SaveInventory(CharacterDatabaseTransaction& trans) +void Player::_SaveInventory(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; // force items in buyback slots to new state @@ -21031,7 +21031,7 @@ void Player::_SaveInventory(CharacterDatabaseTransaction& trans) m_itemUpdateQueue.clear(); } -void Player::_SaveVoidStorage(CharacterDatabaseTransaction& trans) +void Player::_SaveVoidStorage(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = nullptr; @@ -21067,7 +21067,7 @@ void Player::_SaveVoidStorage(CharacterDatabaseTransaction& trans) } } -void Player::_SaveCUFProfiles(CharacterDatabaseTransaction& trans) +void Player::_SaveCUFProfiles(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; for (uint8 i = 0; i < MAX_CUF_PROFILES; ++i) @@ -21103,7 +21103,7 @@ void Player::_SaveCUFProfiles(CharacterDatabaseTransaction& trans) } } -void Player::_SaveMail(CharacterDatabaseTransaction& trans) +void Player::_SaveMail(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; @@ -21173,7 +21173,7 @@ void Player::_SaveMail(CharacterDatabaseTransaction& trans) m_mailsUpdated = false; } -void Player::_SaveQuestStatus(CharacterDatabaseTransaction& trans) +void Player::_SaveQuestStatus(CharacterDatabaseTransaction trans) { bool isTransaction = bool(trans); if (!isTransaction) @@ -21267,7 +21267,7 @@ void Player::_SaveQuestStatus(CharacterDatabaseTransaction& trans) CharacterDatabase.CommitTransaction(trans); } -void Player::_SaveDailyQuestStatus(CharacterDatabaseTransaction& trans) +void Player::_SaveDailyQuestStatus(CharacterDatabaseTransaction trans) { if (!m_DailyQuestChanged) return; @@ -21303,7 +21303,7 @@ void Player::_SaveDailyQuestStatus(CharacterDatabaseTransaction& trans) } } -void Player::_SaveWeeklyQuestStatus(CharacterDatabaseTransaction& trans) +void Player::_SaveWeeklyQuestStatus(CharacterDatabaseTransaction trans) { if (!m_WeeklyQuestChanged || m_weeklyquests.empty()) return; @@ -21326,7 +21326,7 @@ void Player::_SaveWeeklyQuestStatus(CharacterDatabaseTransaction& trans) m_WeeklyQuestChanged = false; } -void Player::_SaveSeasonalQuestStatus(CharacterDatabaseTransaction& trans) +void Player::_SaveSeasonalQuestStatus(CharacterDatabaseTransaction trans) { if (!m_SeasonalQuestChanged) return; @@ -21358,7 +21358,7 @@ void Player::_SaveSeasonalQuestStatus(CharacterDatabaseTransaction& trans) } } -void Player::_SaveMonthlyQuestStatus(CharacterDatabaseTransaction& trans) +void Player::_SaveMonthlyQuestStatus(CharacterDatabaseTransaction trans) { if (!m_MonthlyQuestChanged || m_monthlyquests.empty()) return; @@ -21381,7 +21381,7 @@ void Player::_SaveMonthlyQuestStatus(CharacterDatabaseTransaction& trans) m_MonthlyQuestChanged = false; } -void Player::_SaveSkills(CharacterDatabaseTransaction& trans) +void Player::_SaveSkills(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; // we don't need transactions here. @@ -21429,7 +21429,7 @@ void Player::_SaveSkills(CharacterDatabaseTransaction& trans) } } -void Player::_SaveSpells(CharacterDatabaseTransaction& trans) +void Player::_SaveSpells(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt; @@ -21467,7 +21467,7 @@ void Player::_SaveSpells(CharacterDatabaseTransaction& trans) } } -void Player::_SaveStoredAuraTeleportLocations(CharacterDatabaseTransaction& trans) +void Player::_SaveStoredAuraTeleportLocations(CharacterDatabaseTransaction trans) { for (auto itr = m_storedAuraTeleportLocations.begin(); itr != m_storedAuraTeleportLocations.end(); ) { @@ -21504,7 +21504,7 @@ void Player::_SaveStoredAuraTeleportLocations(CharacterDatabaseTransaction& tran // save player stats -- only for external usage // real stats will be recalculated on player login -void Player::_SaveStats(CharacterDatabaseTransaction& trans) const +void Player::_SaveStats(CharacterDatabaseTransaction trans) const { // check if stat saving is enabled and if char level is high enough if (!sWorld->getIntConfig(CONFIG_MIN_LEVEL_STAT_SAVE) || GetLevel() < sWorld->getIntConfig(CONFIG_MIN_LEVEL_STAT_SAVE)) @@ -21602,7 +21602,7 @@ void Player::UpdateSpeakTime() /*** LOW LEVEL FUNCTIONS:Notifiers ***/ /*********************************************************/ -void Player::SavePositionInDB(WorldLocation const& loc, uint16 zoneId, ObjectGuid guid, CharacterDatabaseTransaction& trans) +void Player::SavePositionInDB(WorldLocation const& loc, uint16 zoneId, ObjectGuid guid, CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHARACTER_POSITION); @@ -27405,7 +27405,7 @@ void Player::SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& newEqSet) eqSlot.State = eqSlot.State == EQUIPMENT_SET_NEW ? EQUIPMENT_SET_NEW : EQUIPMENT_SET_CHANGED; } -void Player::_SaveEquipmentSets(CharacterDatabaseTransaction& trans) +void Player::_SaveEquipmentSets(CharacterDatabaseTransaction trans) { for (EquipmentSetContainer::iterator itr = _equipmentSets.begin(); itr != _equipmentSets.end();) { @@ -27498,7 +27498,7 @@ void Player::_SaveEquipmentSets(CharacterDatabaseTransaction& trans) } } -void Player::_SaveBGData(CharacterDatabaseTransaction& trans) +void Player::_SaveBGData(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PLAYER_BGDATA); stmt->setUInt64(0, GetGUID().GetCounter()); @@ -27591,7 +27591,7 @@ void Player::_LoadGlyphs(PreparedQueryResult result) } while (result->NextRow()); } -void Player::_SaveGlyphs(CharacterDatabaseTransaction& trans) const +void Player::_SaveGlyphs(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_GLYPHS); stmt->setUInt64(0, GetGUID().GetCounter()); @@ -27638,7 +27638,7 @@ void Player::_LoadPvpTalents(PreparedQueryResult result) } } -void Player::_SaveTalents(CharacterDatabaseTransaction& trans) +void Player::_SaveTalents(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_TALENT); stmt->setUInt64(0, GetGUID().GetCounter()); @@ -28261,7 +28261,7 @@ void Player::_LoadPetStable(uint32 summonedPetNumber, PreparedQueryResult result m_temporaryUnsummonedPetNumber = summonedPetNumber; } -void Player::_SaveInstanceTimeRestrictions(CharacterDatabaseTransaction& trans) +void Player::_SaveInstanceTimeRestrictions(CharacterDatabaseTransaction trans) { if (_instanceResetTimes.empty()) return; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 94f196d9db9..313a35889a7 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1677,12 +1677,12 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void SaveToDB(bool create = false); void SaveToDB(LoginDatabaseTransaction loginTransaction, CharacterDatabaseTransaction trans, bool create = false); - void SaveInventoryAndGoldToDB(CharacterDatabaseTransaction& trans); // fast save function for item/money cheating preventing - void SaveGoldToDB(CharacterDatabaseTransaction& trans) const; + void SaveInventoryAndGoldToDB(CharacterDatabaseTransaction trans); // fast save function for item/money cheating preventing + void SaveGoldToDB(CharacterDatabaseTransaction trans) const; static void SaveCustomizations(CharacterDatabaseTransaction trans, ObjectGuid::LowType guid, Trinity::IteratorPair<UF::ChrCustomizationChoice const*> customizations); - static void SavePositionInDB(WorldLocation const& loc, uint16 zoneId, ObjectGuid guid, CharacterDatabaseTransaction& trans); + static void SavePositionInDB(WorldLocation const& loc, uint16 zoneId, ObjectGuid guid, CharacterDatabaseTransaction trans); static void DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRealmChars = true, bool deleteFinally = false); static void DeleteOldCharacters(); @@ -2090,7 +2090,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void SpawnCorpseBones(bool triggerSave = true); Corpse* CreateCorpse(); void KillPlayer(); - static void OfflineResurrect(ObjectGuid const& guid, CharacterDatabaseTransaction& trans); + static void OfflineResurrect(ObjectGuid const& guid, CharacterDatabaseTransaction trans); bool HasCorpse() const { return _corpseLocation.GetMapId() != MAPID_INVALID; } WorldLocation GetCorpseLocation() const { return _corpseLocation; } void InitializeSelfResurrectionSpells(); @@ -2841,27 +2841,27 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> /*********************************************************/ void _SaveCustomizations(CharacterDatabaseTransaction trans); - void _SaveActions(CharacterDatabaseTransaction& trans); - void _SaveAuras(CharacterDatabaseTransaction& trans); - void _SaveInventory(CharacterDatabaseTransaction& trans); - void _SaveVoidStorage(CharacterDatabaseTransaction& trans); - void _SaveMail(CharacterDatabaseTransaction& trans); - void _SaveQuestStatus(CharacterDatabaseTransaction& trans); - void _SaveDailyQuestStatus(CharacterDatabaseTransaction& trans); - void _SaveWeeklyQuestStatus(CharacterDatabaseTransaction& trans); - void _SaveMonthlyQuestStatus(CharacterDatabaseTransaction& trans); - void _SaveSeasonalQuestStatus(CharacterDatabaseTransaction& trans); - void _SaveSkills(CharacterDatabaseTransaction& trans); - void _SaveSpells(CharacterDatabaseTransaction& trans); - void _SaveStoredAuraTeleportLocations(CharacterDatabaseTransaction& trans); - void _SaveEquipmentSets(CharacterDatabaseTransaction& trans); - void _SaveBGData(CharacterDatabaseTransaction& trans); - void _SaveGlyphs(CharacterDatabaseTransaction& trans) const; - void _SaveTalents(CharacterDatabaseTransaction& trans); - void _SaveStats(CharacterDatabaseTransaction& trans) const; - void _SaveInstanceTimeRestrictions(CharacterDatabaseTransaction& trans); - void _SaveCurrency(CharacterDatabaseTransaction& trans); - void _SaveCUFProfiles(CharacterDatabaseTransaction& trans); + void _SaveActions(CharacterDatabaseTransaction trans); + void _SaveAuras(CharacterDatabaseTransaction trans); + void _SaveInventory(CharacterDatabaseTransaction trans); + void _SaveVoidStorage(CharacterDatabaseTransaction trans); + void _SaveMail(CharacterDatabaseTransaction trans); + void _SaveQuestStatus(CharacterDatabaseTransaction trans); + void _SaveDailyQuestStatus(CharacterDatabaseTransaction trans); + void _SaveWeeklyQuestStatus(CharacterDatabaseTransaction trans); + void _SaveMonthlyQuestStatus(CharacterDatabaseTransaction trans); + void _SaveSeasonalQuestStatus(CharacterDatabaseTransaction trans); + void _SaveSkills(CharacterDatabaseTransaction trans); + void _SaveSpells(CharacterDatabaseTransaction trans); + void _SaveStoredAuraTeleportLocations(CharacterDatabaseTransaction trans); + void _SaveEquipmentSets(CharacterDatabaseTransaction trans); + void _SaveBGData(CharacterDatabaseTransaction trans); + void _SaveGlyphs(CharacterDatabaseTransaction trans) const; + void _SaveTalents(CharacterDatabaseTransaction trans); + void _SaveStats(CharacterDatabaseTransaction trans) const; + void _SaveInstanceTimeRestrictions(CharacterDatabaseTransaction trans); + void _SaveCurrency(CharacterDatabaseTransaction trans); + void _SaveCUFProfiles(CharacterDatabaseTransaction trans); /*********************************************************/ /*** ENVIRONMENTAL SYSTEM ***/ @@ -3035,7 +3035,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> InventoryResult CanStoreItem_InBag(uint8 bag, ItemPosCountVec& dest, ItemTemplate const* pProto, uint32& count, bool merge, bool non_specialized, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot) const; InventoryResult CanStoreItem_InInventorySlots(uint8 slot_begin, uint8 slot_end, ItemPosCountVec& dest, ItemTemplate const* pProto, uint32& count, bool merge, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot) const; Item* _StoreItem(uint16 pos, Item* pItem, uint32 count, bool clone, bool update); - Item* _LoadItem(CharacterDatabaseTransaction& trans, uint32 zoneId, uint32 timeDiff, Field* fields); + Item* _LoadItem(CharacterDatabaseTransaction trans, uint32 zoneId, uint32 timeDiff, Field* fields); CinematicMgr* _cinematicMgr; diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index ae1d80796cb..d1747ad5c55 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -117,7 +117,7 @@ inline uint32 Guild::LogHolder<Entry>::GetNextGUID() 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 +void Guild::EventLogEntry::SaveToDB(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_EVENTLOG); stmt->setUInt64(0, m_guildId); @@ -151,7 +151,7 @@ void Guild::EventLogEntry::WritePacket(WorldPackets::Guild::GuildEventLogQueryRe } // BankEventLogEntry -void Guild::BankEventLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const +void Guild::BankEventLogEntry::SaveToDB(CharacterDatabaseTransaction trans) const { uint8 index = 0; @@ -206,7 +206,7 @@ void Guild::BankEventLogEntry::WritePacket(WorldPackets::Guild:: GuildBankLogQue packet.Entry.push_back(bankLogEntry); } -void Guild::NewsLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const +void Guild::NewsLogEntry::SaveToDB(CharacterDatabaseTransaction trans) const { uint8 index = 0; CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_NEWS); @@ -256,7 +256,7 @@ void Guild::RankInfo::LoadFromDB(Field* fields) m_rights |= GR_RIGHT_ALL; } -void Guild::RankInfo::SaveToDB(CharacterDatabaseTransaction& trans) const +void Guild::RankInfo::SaveToDB(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_RANK); stmt->setUInt64(0, m_guildId); @@ -268,7 +268,7 @@ void Guild::RankInfo::SaveToDB(CharacterDatabaseTransaction& trans) const CharacterDatabase.ExecuteOrAppend(trans, stmt); } -void Guild::RankInfo::CreateMissingTabsIfNeeded(uint8 tabs, CharacterDatabaseTransaction& trans, bool logOnCreate /* = false */) +void Guild::RankInfo::CreateMissingTabsIfNeeded(uint8 tabs, CharacterDatabaseTransaction trans, bool logOnCreate /* = false */) { for (uint8 i = 0; i < tabs; ++i) { @@ -408,7 +408,7 @@ bool Guild::BankTab::LoadItemFromDB(Field* fields) } // Deletes contents of the tab from the world (and from DB if necessary) -void Guild::BankTab::Delete(CharacterDatabaseTransaction& trans, bool removeItemsFromDB) +void Guild::BankTab::Delete(CharacterDatabaseTransaction trans, bool removeItemsFromDB) { for (uint8 slotId = 0; slotId < GUILD_BANK_MAX_SLOTS; ++slotId) { @@ -456,7 +456,7 @@ void Guild::BankTab::SetText(std::string_view text) // Sets/removes contents of specified slot. // If pItem == nullptr contents are removed. -bool Guild::BankTab::SetItem(CharacterDatabaseTransaction& trans, uint8 slotId, Item* item) +bool Guild::BankTab::SetItem(CharacterDatabaseTransaction trans, uint8 slotId, Item* item) { if (slotId >= GUILD_BANK_MAX_SLOTS) return false; @@ -593,7 +593,7 @@ void Guild::Member::UpdateLogoutTime() m_logoutTime = GameTime::GetGameTime(); } -void Guild::Member::SaveToDB(CharacterDatabaseTransaction& trans) const +void Guild::Member::SaveToDB(CharacterDatabaseTransaction trans) const { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_MEMBER); stmt->setUInt64(0, m_guildId); @@ -667,7 +667,7 @@ float Guild::Member::GetInactiveDays() const } // Decreases amount of slots left for today. -void Guild::Member::UpdateBankTabWithdrawValue(CharacterDatabaseTransaction& trans, uint8 tabId, uint32 amount) +void Guild::Member::UpdateBankTabWithdrawValue(CharacterDatabaseTransaction trans, uint8 tabId, uint32 amount) { m_bankWithdraw[tabId] += amount; @@ -683,7 +683,7 @@ void Guild::Member::UpdateBankTabWithdrawValue(CharacterDatabaseTransaction& tra } // Decreases amount of money left for today. -void Guild::Member::UpdateBankMoneyWithdrawValue(CharacterDatabaseTransaction& trans, uint64 amount) +void Guild::Member::UpdateBankMoneyWithdrawValue(CharacterDatabaseTransaction trans, uint64 amount) { m_bankWithdrawMoney += amount; @@ -841,7 +841,7 @@ bool Guild::PlayerMoveItemData::InitItem() return (m_pItem != nullptr); } -void Guild::PlayerMoveItemData::RemoveItem(CharacterDatabaseTransaction& trans, MoveItemData* /*pOther*/, uint32 splitedAmount) +void Guild::PlayerMoveItemData::RemoveItem(CharacterDatabaseTransaction trans, MoveItemData* /*pOther*/, uint32 splitedAmount) { if (splitedAmount) { @@ -857,7 +857,7 @@ void Guild::PlayerMoveItemData::RemoveItem(CharacterDatabaseTransaction& trans, } } -Item* Guild::PlayerMoveItemData::StoreItem(CharacterDatabaseTransaction& trans, Item* pItem) +Item* Guild::PlayerMoveItemData::StoreItem(CharacterDatabaseTransaction trans, Item* pItem) { ASSERT(pItem); m_pPlayer->MoveItemToInventory(m_vec, pItem, true); @@ -865,7 +865,7 @@ Item* Guild::PlayerMoveItemData::StoreItem(CharacterDatabaseTransaction& trans, return pItem; } -void Guild::PlayerMoveItemData::LogBankEvent(CharacterDatabaseTransaction& trans, MoveItemData* pFrom, uint32 count) const +void Guild::PlayerMoveItemData::LogBankEvent(CharacterDatabaseTransaction trans, MoveItemData* pFrom, uint32 count) const { ASSERT(pFrom); // Bank -> Char @@ -908,7 +908,7 @@ bool Guild::BankMoveItemData::HasWithdrawRights(MoveItemData* pOther) const return slots != 0; } -void Guild::BankMoveItemData::RemoveItem(CharacterDatabaseTransaction& trans, MoveItemData* pOther, uint32 splitedAmount) +void Guild::BankMoveItemData::RemoveItem(CharacterDatabaseTransaction trans, MoveItemData* pOther, uint32 splitedAmount) { ASSERT(m_pItem); if (splitedAmount) @@ -927,7 +927,7 @@ void Guild::BankMoveItemData::RemoveItem(CharacterDatabaseTransaction& trans, Mo m_pGuild->_UpdateMemberWithdrawSlots(trans, m_pPlayer->GetGUID(), m_container); } -Item* Guild::BankMoveItemData::StoreItem(CharacterDatabaseTransaction& trans, Item* pItem) +Item* Guild::BankMoveItemData::StoreItem(CharacterDatabaseTransaction trans, Item* pItem) { if (!pItem) return nullptr; @@ -951,7 +951,7 @@ Item* Guild::BankMoveItemData::StoreItem(CharacterDatabaseTransaction& trans, It return pLastItem; } -void Guild::BankMoveItemData::LogBankEvent(CharacterDatabaseTransaction& trans, MoveItemData* pFrom, uint32 count) const +void Guild::BankMoveItemData::LogBankEvent(CharacterDatabaseTransaction trans, MoveItemData* pFrom, uint32 count) const { ASSERT(pFrom->GetItem()); if (pFrom->IsBank()) @@ -977,7 +977,7 @@ void Guild::BankMoveItemData::LogAction(MoveItemData* pFrom) const } } -Item* Guild::BankMoveItemData::_StoreItem(CharacterDatabaseTransaction& trans, BankTab* pTab, Item* pItem, ItemPosCount& pos, bool clone) const +Item* Guild::BankMoveItemData::_StoreItem(CharacterDatabaseTransaction trans, BankTab* pTab, Item* pItem, ItemPosCount& pos, bool clone) const { uint8 slotId = uint8(pos.pos); uint32 count = pos.count; @@ -2718,7 +2718,7 @@ void Guild::MassInviteToEvent(WorldSession* session, uint32 minLevel, uint32 max } // Members handling -bool Guild::AddMember(CharacterDatabaseTransaction& trans, ObjectGuid guid, Optional<GuildRankId> rankId /*= {}*/) +bool Guild::AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, Optional<GuildRankId> rankId /*= {}*/) { Player* player = ObjectAccessor::FindConnectedPlayer(guid); // Player cannot be in guild @@ -2808,7 +2808,7 @@ bool Guild::AddMember(CharacterDatabaseTransaction& trans, ObjectGuid guid, Opti return true; } -void Guild::DeleteMember(CharacterDatabaseTransaction& trans, ObjectGuid guid, bool isDisbanding, bool isKicked, bool canDeleteGuild) +void Guild::DeleteMember(CharacterDatabaseTransaction trans, ObjectGuid guid, bool isDisbanding, bool isKicked, bool canDeleteGuild) { // Guild master can be deleted when loading guild and guid doesn't exist in characters table // or when he is removed from guild by gm command @@ -2974,7 +2974,7 @@ bool Guild::_HasRankRight(Player const* player, uint32 right) const return false; } -void Guild::_DeleteMemberFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType lowguid) +void Guild::_DeleteMemberFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType lowguid) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_MEMBER); stmt->setUInt64(0, lowguid); @@ -3006,7 +3006,7 @@ void Guild::_CreateNewBankTab() CharacterDatabase.CommitTransaction(trans); } -void Guild::_CreateDefaultGuildRanks(CharacterDatabaseTransaction& trans, LocaleConstant loc) +void Guild::_CreateDefaultGuildRanks(CharacterDatabaseTransaction trans, LocaleConstant loc) { ASSERT(trans); @@ -3025,7 +3025,7 @@ void Guild::_CreateDefaultGuildRanks(CharacterDatabaseTransaction& trans, Locale _CreateRank(trans, sObjectMgr->GetTrinityString(LANG_GUILD_INITIATE, loc), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK); } -bool Guild::_CreateRank(CharacterDatabaseTransaction& trans, std::string_view name, uint32 rights) +bool Guild::_CreateRank(CharacterDatabaseTransaction trans, std::string_view name, uint32 rights) { if (m_ranks.size() >= GUILD_RANKS_MAX_COUNT) return false; @@ -3080,7 +3080,7 @@ bool Guild::_IsLeader(Player* player) const return false; } -void Guild::_DeleteBankItems(CharacterDatabaseTransaction& trans, bool removeItemsFromDB) +void Guild::_DeleteBankItems(CharacterDatabaseTransaction trans, bool removeItemsFromDB) { for (uint8 tabId = 0; tabId < _GetPurchasedTabsSize(); ++tabId) m_bankTabs[tabId].Delete(trans, removeItemsFromDB); @@ -3088,7 +3088,7 @@ void Guild::_DeleteBankItems(CharacterDatabaseTransaction& trans, bool removeIte m_bankTabs.clear(); } -bool Guild::_ModifyBankMoney(CharacterDatabaseTransaction& trans, uint64 amount, bool add) +bool Guild::_ModifyBankMoney(CharacterDatabaseTransaction trans, uint64 amount, bool add) { if (add) m_bankMoney += amount; @@ -3207,7 +3207,7 @@ inline int64 Guild::_GetMemberRemainingMoney(Member const& member) const return 0; } -inline void Guild::_UpdateMemberWithdrawSlots(CharacterDatabaseTransaction& trans, ObjectGuid guid, uint8 tabId) +inline void Guild::_UpdateMemberWithdrawSlots(CharacterDatabaseTransaction trans, ObjectGuid guid, uint8 tabId) { if (Member* member = GetMember(guid)) member->UpdateBankTabWithdrawValue(trans, tabId, 1); @@ -3236,7 +3236,7 @@ inline void Guild::_LogEvent(GuildEventLogTypes eventType, ObjectGuid::LowType p } // Add new bank event log record -void Guild::_LogBankEvent(CharacterDatabaseTransaction& trans, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType lowguid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId) +void Guild::_LogBankEvent(CharacterDatabaseTransaction trans, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType lowguid, uint64 itemOrMoney, uint16 itemStackCount, uint8 destTabId) { if (tabId > GUILD_BANK_MAX_TABS) return; @@ -3264,7 +3264,7 @@ inline Item* Guild::_GetItem(uint8 tabId, uint8 slotId) const return nullptr; } -inline void Guild::_RemoveItem(CharacterDatabaseTransaction& trans, uint8 tabId, uint8 slotId) +inline void Guild::_RemoveItem(CharacterDatabaseTransaction trans, uint8 tabId, uint8 slotId) { if (BankTab* pTab = GetBankTab(tabId)) pTab->SetItem(trans, slotId, nullptr); diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 075acebb06e..2e7f8c223e8 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -324,7 +324,7 @@ class TC_GAME_API Guild void ResetFlags() { m_flags = GUILDMEMBER_STATUS_NONE; } bool LoadFromDB(Field* fields); - void SaveToDB(CharacterDatabaseTransaction& trans) const; + void SaveToDB(CharacterDatabaseTransaction trans) const; ObjectGuid const& GetGUID() const { return m_guid; } std::string const& GetName() const { return m_name; } @@ -357,8 +357,8 @@ class TC_GAME_API Guild inline bool IsRank(GuildRankId rankId) const { return m_rankId == rankId; } inline bool IsSamePlayer(ObjectGuid guid) const { return m_guid == guid; } - void UpdateBankTabWithdrawValue(CharacterDatabaseTransaction& trans, uint8 tabId, uint32 amount); - void UpdateBankMoneyWithdrawValue(CharacterDatabaseTransaction& trans, uint64 amount); + void UpdateBankTabWithdrawValue(CharacterDatabaseTransaction trans, uint8 tabId, uint32 amount); + void UpdateBankMoneyWithdrawValue(CharacterDatabaseTransaction trans, uint64 amount); uint32 GetBankTabWithdrawValue(uint8 tabId) const { return m_bankWithdraw[tabId]; }; uint64 GetBankMoneyWithdrawValue() const { return m_bankWithdrawMoney; }; void ResetValues(bool weekly = false); @@ -405,7 +405,7 @@ class TC_GAME_API Guild uint32 GetGUID() const { return m_guid; } time_t GetTimestamp() const { return m_timestamp; } - virtual void SaveToDB(CharacterDatabaseTransaction& trans) const = 0; + virtual void SaveToDB(CharacterDatabaseTransaction trans) const = 0; protected: ObjectGuid::LowType m_guildId; @@ -425,7 +425,7 @@ class TC_GAME_API Guild ~EventLogEntry() { } - void SaveToDB(CharacterDatabaseTransaction& trans) const override; + void SaveToDB(CharacterDatabaseTransaction trans) const override; void WritePacket(WorldPackets::Guild::GuildEventLogQueryResults& packet) const; private: @@ -463,7 +463,7 @@ class TC_GAME_API Guild ~BankEventLogEntry() { } - void SaveToDB(CharacterDatabaseTransaction& trans) const override; + void SaveToDB(CharacterDatabaseTransaction trans) const override; void WritePacket(WorldPackets::Guild::GuildBankLogQueryResults& packet) const; private: @@ -499,7 +499,7 @@ class TC_GAME_API Guild m_flags &= ~1; } - void SaveToDB(CharacterDatabaseTransaction& trans) const override; + void SaveToDB(CharacterDatabaseTransaction trans) const override; void WritePacket(WorldPackets::Guild::GuildNews& newsPacket) const; private: @@ -547,7 +547,7 @@ class TC_GAME_API Guild m_guildId(guildId), m_rankId(rankId), m_rankOrder(rankOrder), m_name(name), m_rights(rights), m_bankMoneyPerDay(money) { } void LoadFromDB(Field* fields); - void SaveToDB(CharacterDatabaseTransaction& trans) const; + void SaveToDB(CharacterDatabaseTransaction trans) const; GuildRankId GetId() const { return m_rankId; } @@ -578,7 +578,7 @@ class TC_GAME_API Guild } void SetBankTabSlotsAndRights(GuildBankRightsAndSlots rightsAndSlots, bool saveToDB); - void CreateMissingTabsIfNeeded(uint8 ranks, CharacterDatabaseTransaction& trans, bool logOnCreate = false); + void CreateMissingTabsIfNeeded(uint8 ranks, CharacterDatabaseTransaction trans, bool logOnCreate = false); private: ObjectGuid::LowType m_guildId; @@ -597,7 +597,7 @@ class TC_GAME_API Guild void LoadFromDB(Field* fields); bool LoadItemFromDB(Field* fields); - void Delete(CharacterDatabaseTransaction& trans, bool removeItemsFromDB = false); + void Delete(CharacterDatabaseTransaction trans, bool removeItemsFromDB = false); void SetInfo(std::string_view name, std::string_view icon); void SetText(std::string_view text); @@ -608,7 +608,7 @@ class TC_GAME_API Guild std::string const& GetText() const { return m_text; } inline Item* GetItem(uint8 slotId) const { return slotId < GUILD_BANK_MAX_SLOTS ? m_items[slotId] : nullptr; } - bool SetItem(CharacterDatabaseTransaction& trans, uint8 slotId, Item* item); + bool SetItem(CharacterDatabaseTransaction trans, uint8 slotId, Item* item); private: ObjectGuid::LowType m_guildId; @@ -641,11 +641,11 @@ class TC_GAME_API Guild // Clones stored item bool CloneItem(uint32 count); // Remove item from container (if splited update items fields) - virtual void RemoveItem(CharacterDatabaseTransaction& trans, MoveItemData* pOther, uint32 splitedAmount = 0) = 0; + virtual void RemoveItem(CharacterDatabaseTransaction trans, MoveItemData* pOther, uint32 splitedAmount = 0) = 0; // Saves item to container - virtual Item* StoreItem(CharacterDatabaseTransaction& trans, Item* pItem) = 0; + virtual Item* StoreItem(CharacterDatabaseTransaction trans, Item* pItem) = 0; // Log bank event - virtual void LogBankEvent(CharacterDatabaseTransaction& trans, MoveItemData* pFrom, uint32 count) const = 0; + virtual void LogBankEvent(CharacterDatabaseTransaction trans, MoveItemData* pFrom, uint32 count) const = 0; // Log GM action virtual void LogAction(MoveItemData* pFrom) const; // Copy slots id from position vector @@ -677,9 +677,9 @@ class TC_GAME_API Guild bool IsBank() const override { return false; } bool InitItem() override; - void RemoveItem(CharacterDatabaseTransaction& trans, MoveItemData* pOther, uint32 splitedAmount = 0) override; - Item* StoreItem(CharacterDatabaseTransaction& trans, Item* pItem) override; - void LogBankEvent(CharacterDatabaseTransaction& trans, MoveItemData* pFrom, uint32 count) const override; + void RemoveItem(CharacterDatabaseTransaction trans, MoveItemData* pOther, uint32 splitedAmount = 0) override; + Item* StoreItem(CharacterDatabaseTransaction trans, Item* pItem) override; + void LogBankEvent(CharacterDatabaseTransaction trans, MoveItemData* pFrom, uint32 count) const override; protected: InventoryResult CanStore(Item* pItem, bool swap) override; @@ -695,16 +695,16 @@ class TC_GAME_API Guild bool InitItem() override; bool HasStoreRights(MoveItemData* pOther) const override; bool HasWithdrawRights(MoveItemData* pOther) const override; - void RemoveItem(CharacterDatabaseTransaction& trans, MoveItemData* pOther, uint32 splitedAmount) override; - Item* StoreItem(CharacterDatabaseTransaction& trans, Item* pItem) override; - void LogBankEvent(CharacterDatabaseTransaction& trans, MoveItemData* pFrom, uint32 count) const override; + void RemoveItem(CharacterDatabaseTransaction trans, MoveItemData* pOther, uint32 splitedAmount) override; + Item* StoreItem(CharacterDatabaseTransaction trans, Item* pItem) override; + void LogBankEvent(CharacterDatabaseTransaction trans, MoveItemData* pFrom, uint32 count) const override; void LogAction(MoveItemData* pFrom) const override; protected: InventoryResult CanStore(Item* pItem, bool swap) override; private: - Item* _StoreItem(CharacterDatabaseTransaction& trans, BankTab* pTab, Item* pItem, ItemPosCount& pos, bool clone) const; + Item* _StoreItem(CharacterDatabaseTransaction trans, BankTab* pTab, Item* pItem, ItemPosCount& pos, bool clone) const; bool _ReserveSpace(uint8 slotId, Item* pItem, Item* pItemDest, uint32& count); void CanStoreItemInTab(Item* pItem, uint8 skipSlotId, bool merge, uint32& count); }; @@ -817,8 +817,8 @@ class TC_GAME_API Guild // Members // Adds member to guild. If rankId == GUILD_RANK_NONE, lowest rank is assigned. - bool AddMember(CharacterDatabaseTransaction& trans, ObjectGuid guid, Optional<GuildRankId> rankId = {}); - void DeleteMember(CharacterDatabaseTransaction& trans, ObjectGuid guid, bool isDisbanding = false, bool isKicked = false, bool canDeleteGuild = false); + bool AddMember(CharacterDatabaseTransaction trans, ObjectGuid guid, Optional<GuildRankId> rankId = {}); + void DeleteMember(CharacterDatabaseTransaction trans, ObjectGuid guid, bool isDisbanding = false, bool isKicked = false, bool canDeleteGuild = false); bool ChangeMemberRank(CharacterDatabaseTransaction trans, ObjectGuid guid, GuildRankId newRank); bool IsMember(ObjectGuid guid) const; uint32 GetMembersCount() const { return uint32(m_members.size()); } @@ -901,19 +901,19 @@ class TC_GAME_API Guild return nullptr; } - static void _DeleteMemberFromDB(CharacterDatabaseTransaction& trans, ObjectGuid::LowType lowguid); + static void _DeleteMemberFromDB(CharacterDatabaseTransaction trans, ObjectGuid::LowType lowguid); // Tries to create new bank tab void _CreateNewBankTab(); // Creates default guild ranks with names in given locale - void _CreateDefaultGuildRanks(CharacterDatabaseTransaction& trans, LocaleConstant loc); + void _CreateDefaultGuildRanks(CharacterDatabaseTransaction trans, LocaleConstant loc); // Creates new rank - bool _CreateRank(CharacterDatabaseTransaction& trans, std::string_view name, uint32 rights); + bool _CreateRank(CharacterDatabaseTransaction trans, std::string_view name, uint32 rights); // Update account number when member added/removed from guild void _UpdateAccountsNumber(); bool _IsLeader(Player* player) const; - void _DeleteBankItems(CharacterDatabaseTransaction& trans, bool removeItemsFromDB = false); - bool _ModifyBankMoney(CharacterDatabaseTransaction& trans, uint64 amount, bool add); + void _DeleteBankItems(CharacterDatabaseTransaction trans, bool removeItemsFromDB = false); + bool _ModifyBankMoney(CharacterDatabaseTransaction trans, uint64 amount, bool add); void _SetLeader(CharacterDatabaseTransaction trans, Member& leader); void _SetRankBankMoneyPerDay(GuildRankId rankId, uint32 moneyPerDay); @@ -926,14 +926,14 @@ class TC_GAME_API Guild int32 _GetMemberRemainingSlots(Member const& member, uint8 tabId) const; int64 _GetMemberRemainingMoney(Member const& member) const; - void _UpdateMemberWithdrawSlots(CharacterDatabaseTransaction& trans, ObjectGuid guid, uint8 tabId); + void _UpdateMemberWithdrawSlots(CharacterDatabaseTransaction trans, ObjectGuid guid, uint8 tabId); bool _MemberHasTabRights(ObjectGuid guid, uint8 tabId, int32 rights) const; void _LogEvent(GuildEventLogTypes eventType, ObjectGuid::LowType playerGuid1, ObjectGuid::LowType playerGuid2 = UI64LIT(0), uint8 newRank = 0); - void _LogBankEvent(CharacterDatabaseTransaction& trans, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount = 0, uint8 destTabId = 0); + void _LogBankEvent(CharacterDatabaseTransaction trans, GuildBankEventLogTypes eventType, uint8 tabId, ObjectGuid::LowType playerGuid, uint64 itemOrMoney, uint16 itemStackCount = 0, uint8 destTabId = 0); Item* _GetItem(uint8 tabId, uint8 slotId) const; - void _RemoveItem(CharacterDatabaseTransaction& trans, uint8 tabId, uint8 slotId); + void _RemoveItem(CharacterDatabaseTransaction trans, uint8 tabId, uint8 slotId); void _MoveItems(MoveItemData* pSrc, MoveItemData* pDest, uint32 splitedAmount) const; static InventoryResult _DoItemsMove(MoveItemData* pSrc, MoveItemData* pDest, bool sendError, uint32 splitedAmount = 0); diff --git a/src/server/game/Loot/LootItemStorage.cpp b/src/server/game/Loot/LootItemStorage.cpp index 3347dba6aa8..f4ada654012 100644 --- a/src/server/game/Loot/LootItemStorage.cpp +++ b/src/server/game/Loot/LootItemStorage.cpp @@ -288,7 +288,7 @@ void LootItemStorage::AddNewStoredLoot(Loot* loot, Player* player) } } -void StoredLootContainer::AddLootItem(LootItem const& lootItem, CharacterDatabaseTransaction& trans) +void StoredLootContainer::AddLootItem(LootItem const& lootItem, CharacterDatabaseTransaction trans) { _lootItems.emplace(std::piecewise_construct, std::forward_as_tuple(lootItem.itemid), std::forward_as_tuple(lootItem)); if (!trans) @@ -315,7 +315,7 @@ void StoredLootContainer::AddLootItem(LootItem const& lootItem, CharacterDatabas trans->Append(stmt); } -void StoredLootContainer::AddMoney(uint32 money, CharacterDatabaseTransaction& trans) +void StoredLootContainer::AddMoney(uint32 money, CharacterDatabaseTransaction trans) { _money = money; if (!trans) diff --git a/src/server/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h index 4aaace652c2..700ebb1048a 100644 --- a/src/server/game/Loot/LootItemStorage.h +++ b/src/server/game/Loot/LootItemStorage.h @@ -56,8 +56,8 @@ class StoredLootContainer explicit StoredLootContainer(uint64 containerId) : _containerId(containerId), _money(0) { } - void AddLootItem(LootItem const& lootItem, CharacterDatabaseTransaction& trans); - void AddMoney(uint32 money, CharacterDatabaseTransaction& trans); + void AddLootItem(LootItem const& lootItem, CharacterDatabaseTransaction trans); + void AddMoney(uint32 money, CharacterDatabaseTransaction trans); void RemoveMoney(); void RemoveItem(uint32 itemId, uint32 count); diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 731607645ae..dfdba81f51e 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -101,7 +101,7 @@ MailDraft& MailDraft::AddItem(Item* item) return *this; } -void MailDraft::prepareItems(Player* receiver, CharacterDatabaseTransaction& trans) +void MailDraft::prepareItems(Player* receiver, CharacterDatabaseTransaction trans) { if (!m_mailTemplateId || !m_mailTemplateItemsNeed) return; @@ -131,7 +131,7 @@ void MailDraft::prepareItems(Player* receiver, CharacterDatabaseTransaction& tra } } -void MailDraft::deleteIncludedItems(CharacterDatabaseTransaction& trans, bool inDB /*= false*/ ) +void MailDraft::deleteIncludedItems(CharacterDatabaseTransaction trans, bool inDB /*= false*/ ) { for (MailItemMap::iterator mailItemIter = m_items.begin(); mailItemIter != m_items.end(); ++mailItemIter) { @@ -146,7 +146,7 @@ void MailDraft::deleteIncludedItems(CharacterDatabaseTransaction& trans, bool in m_items.clear(); } -void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender_guid, ObjectGuid::LowType receiver_guid, CharacterDatabaseTransaction& trans) +void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender_guid, ObjectGuid::LowType receiver_guid, CharacterDatabaseTransaction trans) { ObjectGuid receiverGuid = ObjectGuid::Create<HighGuid::Player>(receiver_guid); Player* receiver = ObjectAccessor::FindConnectedPlayer(receiverGuid); @@ -189,7 +189,7 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender SendMailTo(trans, MailReceiver(receiver, receiver_guid), MailSender(MAIL_NORMAL, sender_guid), MAIL_CHECK_MASK_RETURNED, deliver_delay); } -void MailDraft::SendMailTo(CharacterDatabaseTransaction& trans, MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked, uint32 deliver_delay) +void MailDraft::SendMailTo(CharacterDatabaseTransaction trans, MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked, uint32 deliver_delay) { Player* pReceiver = receiver.GetPlayer(); // can be NULL Player* pSender = sender.GetMailMessageType() == MAIL_NORMAL ? ObjectAccessor::FindPlayer(ObjectGuid::Create<HighGuid::Player>(sender.GetSenderId())) : nullptr; diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index dc9ea2828df..d6f512674d5 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -144,12 +144,12 @@ class TC_GAME_API MailDraft MailDraft& AddCOD(uint64 COD) { m_COD = COD; return *this; } public: // finishers - void SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender_guid, ObjectGuid::LowType receiver_guid, CharacterDatabaseTransaction& trans); - void SendMailTo(CharacterDatabaseTransaction& trans, MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked = MAIL_CHECK_MASK_NONE, uint32 deliver_delay = 0); + void SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender_guid, ObjectGuid::LowType receiver_guid, CharacterDatabaseTransaction trans); + void SendMailTo(CharacterDatabaseTransaction trans, MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked = MAIL_CHECK_MASK_NONE, uint32 deliver_delay = 0); private: - void deleteIncludedItems(CharacterDatabaseTransaction& trans, bool inDB = false); - void prepareItems(Player* receiver, CharacterDatabaseTransaction& trans); // called from SendMailTo for generate mailTemplateBase items + void deleteIncludedItems(CharacterDatabaseTransaction trans, bool inDB = false); + void prepareItems(Player* receiver, CharacterDatabaseTransaction trans); // called from SendMailTo for generate mailTemplateBase items uint16 m_mailTemplateId; bool m_mailTemplateItemsNeed; diff --git a/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp b/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp index c704be563fb..7543c1f5385 100644 --- a/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp +++ b/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp @@ -120,7 +120,7 @@ void QuestObjectiveCriteriaMgr::LoadFromDB(PreparedQueryResult objectiveResult, } } -void QuestObjectiveCriteriaMgr::SaveToDB(CharacterDatabaseTransaction& trans) +void QuestObjectiveCriteriaMgr::SaveToDB(CharacterDatabaseTransaction trans) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CHAR_QUESTSTATUS_OBJECTIVES_CRITERIA); stmt->setUInt64(0, _owner->GetGUID().GetCounter()); diff --git a/src/server/game/Quests/QuestObjectiveCriteriaMgr.h b/src/server/game/Quests/QuestObjectiveCriteriaMgr.h index d2a97a93d47..db56e88f853 100644 --- a/src/server/game/Quests/QuestObjectiveCriteriaMgr.h +++ b/src/server/game/Quests/QuestObjectiveCriteriaMgr.h @@ -32,7 +32,7 @@ public: static void DeleteFromDB(ObjectGuid const& guid); void LoadFromDB(PreparedQueryResult objectiveResult, PreparedQueryResult criteriaResult); - void SaveToDB(CharacterDatabaseTransaction& trans); + void SaveToDB(CharacterDatabaseTransaction trans); void ResetCriteria(CriteriaFailEvent failEvent, int32 failAsset, bool evenIfCriteriaComplete = false); void ResetCriteriaTree(uint32 criteriaTreeId); diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 8f684896827..d40d10d7c5e 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -677,7 +677,7 @@ void ReputationMgr::LoadFromDB(PreparedQueryResult result) } } -void ReputationMgr::SaveToDB(CharacterDatabaseTransaction& trans) +void ReputationMgr::SaveToDB(CharacterDatabaseTransaction trans) { for (FactionStateList::iterator itr = _factions.begin(); itr != _factions.end(); ++itr) { diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index dc22fe6cd8d..add122cabc4 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -72,7 +72,7 @@ class TC_GAME_API ReputationMgr _visibleFactionCount(0), _honoredFactionCount(0), _reveredFactionCount(0), _exaltedFactionCount(0), _sendFactionIncreased(false) { } ~ReputationMgr() { } - void SaveToDB(CharacterDatabaseTransaction& trans); + void SaveToDB(CharacterDatabaseTransaction trans); void LoadFromDB(PreparedQueryResult result); public: // statics static std::set<int32> const ReputationRankThresholds; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 0e14b0afc49..802e0cc7e7e 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -912,7 +912,7 @@ void WorldSession::SendTutorialsData() SendPacket(packet.Write()); } -void WorldSession::SaveTutorialsData(CharacterDatabaseTransaction& trans) +void WorldSession::SaveTutorialsData(CharacterDatabaseTransaction trans) { if (!(_tutorialsChanged & TUTORIALS_FLAG_CHANGED)) return; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index b71a6a193d3..bd2289d8bc9 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1080,7 +1080,7 @@ class TC_GAME_API WorldSession void LoadTutorialsData(PreparedQueryResult result); void SendTutorialsData(); - void SaveTutorialsData(CharacterDatabaseTransaction& trans); + void SaveTutorialsData(CharacterDatabaseTransaction trans); uint32 GetTutorialInt(uint8 index) const { return _tutorials[index]; } void SetTutorialInt(uint8 index, uint32 value) { diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 5070f932acc..5c449789d41 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -172,7 +172,7 @@ void SpellHistory::LoadFromDB(PreparedQueryResult cooldownsResult, PreparedQuery } template<class OwnerType> -void SpellHistory::SaveToDB(CharacterDatabaseTransaction& trans) +void SpellHistory::SaveToDB(CharacterDatabaseTransaction trans) { using StatementInfo = PersistenceHelper<OwnerType>; @@ -1063,5 +1063,5 @@ void SpellHistory::RestoreCooldownStateAfterDuel() template void SpellHistory::LoadFromDB<Player>(PreparedQueryResult cooldownsResult, PreparedQueryResult chargesResult); template void SpellHistory::LoadFromDB<Pet>(PreparedQueryResult cooldownsResult, PreparedQueryResult chargesResult); -template void SpellHistory::SaveToDB<Player>(CharacterDatabaseTransaction& trans); -template void SpellHistory::SaveToDB<Pet>(CharacterDatabaseTransaction& trans); +template void SpellHistory::SaveToDB<Player>(CharacterDatabaseTransaction trans); +template void SpellHistory::SaveToDB<Pet>(CharacterDatabaseTransaction trans); diff --git a/src/server/game/Spells/SpellHistory.h b/src/server/game/Spells/SpellHistory.h index 5aea2d26702..2ec68b33cd6 100644 --- a/src/server/game/Spells/SpellHistory.h +++ b/src/server/game/Spells/SpellHistory.h @@ -81,7 +81,7 @@ public: void LoadFromDB(PreparedQueryResult cooldownsResult, PreparedQueryResult chargesResult); template<class OwnerType> - void SaveToDB(CharacterDatabaseTransaction& trans); + void SaveToDB(CharacterDatabaseTransaction trans); void Update(); |