INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 07:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use unique_ptr for ZoneLoading

Browse Source
This commit is contained in:
Jan
2021-03-14 12:34:50 +01:00
parent 94230cefb0
commit 301f6e3e7a
14 changed files with 118 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ZoneCommon/Zone/ZoneMemory.cpp
View File

@ -3,16 +3,7 @@
ZoneMemory::ZoneMemory()
= default;
ZoneMemory::~ZoneMemory()
void ZoneMemory::AddBlock(std::unique_ptr<XBlock> block)
{
for (auto block : m_blocks)
{
delete block;
}
m_blocks.clear();
}
void ZoneMemory::AddBlock(XBlock* block)
{
m_blocks.push_back(block);
m_blocks.emplace_back(std::move(block));
}

9
src/ZoneCommon/Zone/ZoneMemory.h
View File

@ -1,16 +1,17 @@
#pragma once
#include <memory>
#include <vector>
#include "Utils/MemoryManager.h"
#include "Zone/XBlock.h"
#include <vector>
class ZoneMemory : public MemoryManager
{
std::vector<XBlock*> m_blocks;
std::vector<std::unique_ptr<XBlock>> m_blocks;
public:
ZoneMemory();
~ZoneMemory() override;
void AddBlock(XBlock* block);
void AddBlock(std::unique_ptr<XBlock> block);
};