Use boost::optional and boost::none instead of smelly pointer (#24134)

* Remove bad pointer usage from CharacterCache

Use TrinityCore Option type instead which is intended for this purpose. (Wrapper around boost::option until C++17 bump is finalised)

* Unify codestyle regarding TC optional type

Based upon advice from @Shauren
This commit is contained in:
Ujp8LfXBJ6wCPR
2020-02-08 20:29:18 +01:00
committed by GitHub
parent c574972cb2
commit 76831f1f46
6 changed files with 9 additions and 8 deletions

View File

@@ -52,7 +52,7 @@ class TC_GAME_API GameObjectAI
static int32 Permissible(GameObject const* go);
// Called when the dialog status between a player and the gameobject is requested.
virtual Optional<QuestGiverStatus> GetDialogStatus(Player* /*player*/) { return boost::none; }
virtual Optional<QuestGiverStatus> GetDialogStatus(Player* /*player*/) { return {}; }
// Called when a player opens a gossip dialog with the gameobject.
virtual bool GossipHello(Player* /*player*/) { return false; }

View File

@@ -192,7 +192,7 @@ class TC_GAME_API CreatureAI : public UnitAI
/// == Gossip system ================================
// Called when the dialog status between a player and the creature is requested.
virtual Optional<QuestGiverStatus> GetDialogStatus(Player* /*player*/) { return boost::none; }
virtual Optional<QuestGiverStatus> GetDialogStatus(Player* /*player*/) { return {}; }
// Called when a player opens a gossip dialog with the creature.
virtual bool GossipHello(Player* /*player*/) { return false; }

View File

@@ -116,7 +116,7 @@ void CharacterCache::DeleteCharacterCacheEntry(ObjectGuid const& guid, std::stri
_characterCacheByNameStore.erase(name);
}
void CharacterCache::UpdateCharacterData(ObjectGuid const& guid, std::string const& name, uint8* gender /*= nullptr*/, uint8* race /*= nullptr*/)
void CharacterCache::UpdateCharacterData(ObjectGuid const& guid, std::string const& name, Optional<uint8> gender /*= {}*/, Optional<uint8> race /*= {}*/)
{
auto itr = _characterCacheStore.find(guid);
if (itr == _characterCacheStore.end())

View File

@@ -20,6 +20,7 @@
#include "Define.h"
#include "ObjectGuid.h"
#include "Optional.h"
#include <string>
struct CharacterCacheEntry
@@ -46,7 +47,7 @@ class TC_GAME_API CharacterCache
void AddCharacterCacheEntry(ObjectGuid const& guid, uint32 accountId, std::string const& name, uint8 gender, uint8 race, uint8 playerClass, uint8 level);
void DeleteCharacterCacheEntry(ObjectGuid const& guid, std::string const& name);
void UpdateCharacterData(ObjectGuid const& guid, std::string const& name, uint8* gender = nullptr, uint8* race = nullptr);
void UpdateCharacterData(ObjectGuid const& guid, std::string const& name, Optional<uint8> gender = {}, Optional<uint8> race = {});
void UpdateCharacterLevel(ObjectGuid const& guid, uint8 level);
void UpdateCharacterAccountId(ObjectGuid const& guid, uint32 accountId);
void UpdateCharacterGuildId(ObjectGuid const& guid, ObjectGuid::LowType guildId);

View File

@@ -1459,7 +1459,7 @@ void WorldSession::HandleCharCustomizeCallback(std::shared_ptr<CharacterCustomiz
CharacterDatabase.CommitTransaction(trans);
sCharacterCache->UpdateCharacterData(customizeInfo->Guid, customizeInfo->Name, &customizeInfo->Gender);
sCharacterCache->UpdateCharacterData(customizeInfo->Guid, customizeInfo->Name, customizeInfo->Gender);
SendCharCustomize(RESPONSE_SUCCESS, customizeInfo.get());
@@ -1758,7 +1758,7 @@ void WorldSession::HandleCharFactionOrRaceChangeCallback(std::shared_ptr<Charact
trans->Append(stmt);
}
sCharacterCache->UpdateCharacterData(factionChangeInfo->Guid, factionChangeInfo->Name, &factionChangeInfo->Gender, &factionChangeInfo->Race);
sCharacterCache->UpdateCharacterData(factionChangeInfo->Guid, factionChangeInfo->Name, factionChangeInfo->Gender, factionChangeInfo->Race);
if (oldRace != factionChangeInfo->Race)
{

View File

@@ -275,7 +275,7 @@ Optional<std::shared_ptr<ScriptModule>>
path.generic_string().c_str());
}
return boost::none;
return {};
}
// Use RAII to release the library on failure.
@@ -302,7 +302,7 @@ Optional<std::shared_ptr<ScriptModule>>
TC_LOG_ERROR("scripts.hotswap", "Could not extract all required functions from the shared library \"%s\"!",
path.generic_string().c_str());
return boost::none;
return {};
}
}