lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove usage of raw pointers

Browse Source
This commit is contained in:
k0t9i 2023-01-23 23:48:35 +04:00
parent 032581512d
commit 9592833ddf
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
L2BotDll/Services/WorldHandler.h
View File

@ -1,6 +1,8 @@
#pragma once
#include <cstdint>
#include <thread>
#include <memory>
#include <Windows.h>
#include "Domain/Services/EntityService.h"
#include "Domain/Serializers/SerializableStateContainer.h"
@ -113,29 +115,24 @@ private:
const std::vector<Serializers::Node> GetData()
{
std::vector<Serializers::Serializable*> items
std::vector<Serializers::SerializableStateContainer> items
{
new Serializers::SerializableStateContainer(m_HeroService.GetEntities(), "hero"),
new Serializers::SerializableStateContainer(m_DropService.GetEntities(), "drop"),
new Serializers::SerializableStateContainer(m_NPCService.GetEntities(), "npc"),
new Serializers::SerializableStateContainer(m_PlayerService.GetEntities(), "player"),
new Serializers::SerializableStateContainer(m_SkillService.GetEntities(), "skill"),
Serializers::SerializableStateContainer{m_HeroService.GetEntities(), "hero"},
Serializers::SerializableStateContainer{m_DropService.GetEntities(), "drop"},
Serializers::SerializableStateContainer{m_NPCService.GetEntities(), "npc"},
Serializers::SerializableStateContainer{m_PlayerService.GetEntities(), "player"},
Serializers::SerializableStateContainer{m_SkillService.GetEntities(), "skill"},
};
std::vector<Serializers::Node> result;
for (const auto& item : items)
{
for (const auto node : item->BuildSerializationNodes())
for (const auto node : item.BuildSerializationNodes())
{
result.push_back(node);
}
}
for (const auto& item : items)
{
delete item;
}
return result;
}

10
L2BotDll/Transports/NamedPipe.h
View File

@ -2,6 +2,7 @@
#include <Windows.h>
#include <string>
#include <memory>
#include <cstdint>
#define BUFFER_SIZE 16384
@ -95,8 +96,8 @@ public:
}
DWORD dwRead;
char* buffer = new char[BUFFER_SIZE];
const auto result = ReadFile(m_Pipe, buffer, BUFFER_SIZE * sizeof(char), &dwRead, &m_ReadingOverlapped);
std::unique_ptr<char[]> buffer = std::make_unique<char[]>(BUFFER_SIZE);
const auto result = ReadFile(m_Pipe, buffer.get(), BUFFER_SIZE * sizeof(char), &dwRead, &m_ReadingOverlapped);
const auto lastError = GetLastError();
if (!result)
@ -108,21 +109,18 @@ public:
const auto overlappedResult = GetOverlappedResult(m_Pipe, &m_ReadingOverlapped, &ret, false);
if (!overlappedResult)
{
delete[] buffer;
m_Connected = false;
return "";
}
}
else
{
delete[] buffer;
m_Connected = false;
return "";
}
}
std::string message = std::string(buffer);
delete[] buffer;
std::string message = std::string(buffer.get());
return message;
}