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

Use std::string for TitleSequenceParkHandle HintPath

Browse Source 
Co-authored-by: Gabriel Guedes <gabriel.guedesaz@gmail.com>
This commit is contained in:
Matt
2020-09-28 17:13:31 +03:00
parent 17bff41e82
commit e3a4d6a245
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2-ui/windows/TitleEditor.cpp
View File

@@ -345,12 +345,11 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
{
auto handle = TitleSequenceGetParkHandle(*_editingTitleSequence, w->selected_list_item);
auto stream = static_cast<OpenRCT2::IStream*>(handle->Stream);
auto hintPath = String::ToStd(handle->HintPath);
bool isScenario = ParkImporter::ExtensionIsScenario(hintPath);
bool isScenario = ParkImporter::ExtensionIsScenario(handle->HintPath);
try
{
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
auto parkImporter = std::unique_ptr<IParkImporter>(ParkImporter::Create(hintPath));
auto parkImporter = std::unique_ptr<IParkImporter>(ParkImporter::Create(handle->HintPath));
auto result = parkImporter->LoadFromStream(stream, isScenario);
objectMgr.LoadObjects(result.RequiredObjects.data(), result.RequiredObjects.size());
parkImporter->Import();

10
src/openrct2/title/TitleSequence.cpp
View File

@@ -119,7 +119,7 @@ std::unique_ptr<TitleSequenceParkHandle> TitleSequenceGetParkHandle(TitleSequenc
handle = std::make_unique<TitleSequenceParkHandle>();
handle->Stream = ms;
handle->HintPath = String::Duplicate(filename);
handle->HintPath = filename;
}
else
{
@@ -143,19 +143,13 @@ std::unique_ptr<TitleSequenceParkHandle> TitleSequenceGetParkHandle(TitleSequenc
{
handle = std::make_unique<TitleSequenceParkHandle>();
handle->Stream = fileStream;
handle->HintPath = String::Duplicate(filename);
handle->HintPath = filename;
}
}
}
return handle;
}
void TitleSequenceCloseParkHandle(TitleSequenceParkHandle& handle)
{
Memory::Free(handle.HintPath);
delete (static_cast<OpenRCT2::IStream*>(handle.Stream));
}
bool TitleSequenceSave(TitleSequence& seq)
{
try

2
src/openrct2/title/TitleSequence.h
View File

@@ -53,7 +53,7 @@ struct TitleSequence
struct TitleSequenceParkHandle
{
const utf8* HintPath;
std::string HintPath;
void* Stream;
};