mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Use unique_ptr for GetStreamFromRCT2Scenario

Browse Source
This commit is contained in:
Matt
2020-09-28 20:16:52 +03:00
committed by Gymnasiast
parent 5f0aed0929
commit 213b6cc672
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/scenario/ScenarioRepository.cpp
View File

@@ -204,16 +204,18 @@ protected:
}
private:
static IStream* GetStreamFromRCT2Scenario(const std::string& path)
static std::unique_ptr<IStream> GetStreamFromRCT2Scenario(const std::string& path)
{
if (String::Equals(Path::GetExtension(path), ".sea", true))
{
auto data = DecryptSea(fs::u8path(path));
auto ms = new MemoryStream(data.data(), data.size(), MEMORY_ACCESS::READ);
auto ms = std::make_unique<MemoryStream>();
ms->Write(data.data(), data.size());
ms->SetPosition(0);
return ms;
}
auto fs = new FileStream(path, FILE_MODE_OPEN);
auto fs = std::make_unique<FileStream>(path, FILE_MODE_OPEN);
return fs;
}
@@ -250,7 +252,7 @@ private:
{
// RCT2 or RCTC scenario
auto stream = GetStreamFromRCT2Scenario(path);
auto chunkReader = SawyerChunkReader(stream);
auto chunkReader = SawyerChunkReader(stream.get());
rct_s6_header header = chunkReader.ReadChunkAs<rct_s6_header>();
if (header.type == S6_TYPE_SCENARIO)
@@ -265,12 +267,10 @@ private:
}
*entry = CreateNewScenarioEntry(path, timestamp, &info);
delete stream;
return true;
}
else
{
delete stream;
log_verbose("%s is not a scenario", path.c_str());
}
}