Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-10 01:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move to shared pointer

Browse Source
This commit is contained in:
David Markowitz
2023-06-07 00:23:50 -07:00
parent ea9d0d8592
commit 9e9e4dc087
219 changed files with 743 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dGame/dMission/Mission.cpp
View File

@@ -319,12 +319,12 @@ void Mission::Complete(const bool yieldRewards) {
return;
}
auto* characterComponent = entity->GetComponent<CharacterComponent>();
auto characterComponent = entity->GetComponent<CharacterComponent>();
if (characterComponent != nullptr) {
characterComponent->TrackMissionCompletion(!info->isMission);
}
auto* missionComponent = entity->GetComponent<MissionComponent>();
auto missionComponent = entity->GetComponent<MissionComponent>();
missionComponent->Progress(eMissionTaskType::META, info->id);
@@ -372,7 +372,7 @@ void Mission::CheckCompletion() {
void Mission::Catchup() {
auto* entity = GetAssociate();
auto* inventory = static_cast<InventoryComponent*>(entity->GetComponent(eReplicaComponentType::INVENTORY));
auto inventory = entity->GetComponent<InventoryComponent>();
for (auto* task : m_Tasks) {
const auto type = task->GetType();
@@ -414,11 +414,11 @@ void Mission::YieldRewards() {
auto* character = GetUser()->GetLastUsedChar();
auto* inventoryComponent = entity->GetComponent<InventoryComponent>();
auto* levelComponent = entity->GetComponent<LevelProgressionComponent>();
auto* characterComponent = entity->GetComponent<CharacterComponent>();
auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
auto* missionComponent = entity->GetComponent<MissionComponent>();
auto inventoryComponent = entity->GetComponent<InventoryComponent>();
auto levelComponent = entity->GetComponent<LevelProgressionComponent>();
auto characterComponent = entity->GetComponent<CharacterComponent>();
auto destroyableComponent = entity->GetComponent<DestroyableComponent>();
auto missionComponent = entity->GetComponent<MissionComponent>();
// Remove mission items
for (auto* task : m_Tasks) {

10
dGame/dMission/MissionTask.cpp
View File

@@ -194,7 +194,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
return;
}
auto* inventoryComponent = mission->GetAssociate()->GetComponent<InventoryComponent>();
auto inventoryComponent = mission->GetAssociate()->GetComponent<InventoryComponent>();
if (inventoryComponent != nullptr) {
int32_t itemCount = inventoryComponent->GetLotCountNonTransfer(value);
@@ -213,7 +213,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
}
Entity* entity;
ScriptedActivityComponent* activity;
std::shared_ptr<ScriptedActivityComponent> activity;
uint32_t activityId;
uint32_t lot;
uint32_t collectionId;
@@ -238,7 +238,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
break;
}
activity = static_cast<ScriptedActivityComponent*>(entity->GetComponent(eReplicaComponentType::QUICK_BUILD));
activity = entity->GetComponent<ScriptedActivityComponent>();
if (activity == nullptr) {
break;
}
@@ -308,7 +308,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
int32_t gameID = minigameManager->GetLOT();
auto* sac = minigameManager->GetComponent<ScriptedActivityComponent>();
auto sac = minigameManager->GetComponent<ScriptedActivityComponent>();
if (sac != nullptr) {
gameID = sac->GetActivityID();
}
@@ -368,7 +368,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
if (entity == nullptr) break;
auto* missionComponent = entity->GetComponent<MissionComponent>();
auto missionComponent = entity->GetComponent<MissionComponent>();
if (missionComponent == nullptr) break;