feat: use shared_ptr for object state

This commit is contained in:
k0t9i
2023-01-23 23:40:51 +04:00
parent 3ccdf1d9e4
commit 032581512d
9 changed files with 19 additions and 22 deletions

View File

@@ -1,6 +1,7 @@
#pragma once
#include <map>
#include <memory>
#include "Domain/Repositories/EntityRepositoryInterface.h"
#include "Domain/DTO/EntityState.h"
#include "../Factories/DropFactory.h"
@@ -15,7 +16,7 @@ namespace Interlude
class DropRepository : public Repositories::EntityRepositoryInterface, public FindObjectsTrait
{
public:
const std::vector<DTO::EntityState*> GetEntities() override
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{
const std::map<uint32_t, Item*> items = FindAllObjects<Item*>(m_Radius, [this](float_t radius, int32_t prevId) {
return m_NetworkHandler.GetNextItem(radius, prevId);
@@ -24,7 +25,7 @@ namespace Interlude
return m_Factory.Create(item);
});
auto result = std::vector<DTO::EntityState*>();
auto result = std::vector<std::shared_ptr<DTO::EntityState>>();
for (const auto kvp : objects)
{

View File

@@ -15,7 +15,7 @@ namespace Interlude
class HeroRepository : public Repositories::EntityRepositoryInterface
{
public:
const std::vector<DTO::EntityState*> GetEntities() override
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{
auto hero = m_NetworkHandler.GetHero();
@@ -41,7 +41,7 @@ namespace Interlude
return m_Factory.Create(item);
});
auto result = std::vector<DTO::EntityState*>();
auto result = std::vector<std::shared_ptr<DTO::EntityState>>();
for (const auto kvp : objects)
{

View File

@@ -17,7 +17,7 @@ namespace Interlude
class NPCRepository : public Repositories::EntityRepositoryInterface, public FindObjectsTrait
{
public:
const std::vector<DTO::EntityState*> GetEntities() override
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{
const auto creatures = FindAllObjects<User*>(m_Radius, [this](float_t radius, int32_t prevId) {
return m_NetworkHandler.GetNextCreature(radius, prevId);
@@ -37,7 +37,7 @@ namespace Interlude
return m_Factory.Create(item, spoilState);
});
auto result = std::vector<DTO::EntityState*>();
auto result = std::vector<std::shared_ptr<DTO::EntityState>>();
for (const auto kvp : objects)
{

View File

@@ -13,7 +13,7 @@ namespace Interlude
class PlayerRepository : public Repositories::EntityRepositoryInterface, public FindObjectsTrait
{
public:
const std::vector<DTO::EntityState*> GetEntities() override
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{
const auto creatures = FindAllObjects<User*>(m_Radius, [this](float_t radius, int32_t prevId) {
return m_NetworkHandler.GetNextCreature(radius, prevId);
@@ -32,7 +32,7 @@ namespace Interlude
return m_Factory.Create(item);
});
auto result = std::vector<DTO::EntityState*>();
auto result = std::vector<std::shared_ptr<DTO::EntityState>>();
for (const auto kvp : objects)
{

View File

@@ -22,7 +22,7 @@ namespace Interlude
class SkillRepository : public Repositories::EntityRepositoryInterface
{
public:
const std::vector<DTO::EntityState*> GetEntities() override
const std::vector<std::shared_ptr<DTO::EntityState>> GetEntities() override
{
std::unique_lock<std::shared_timed_mutex>(m_Mutex);
@@ -36,7 +36,7 @@ namespace Interlude
return std::make_unique<Entities::Skill>(item);
});
auto result = std::vector<DTO::EntityState*>();
auto result = std::vector<std::shared_ptr<DTO::EntityState>>();
for (const auto kvp : objects)
{