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

Remove C string overload for Path::GetAbsolute()

Browse Source
This commit is contained in:
Gymnasiast
2022-01-26 14:54:49 +01:00
parent 0577497c32
commit d7dcffbee8
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/cmdline/ConvertCommand.cpp
View File

@@ -41,9 +41,8 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
return EXITCODE_FAIL;
}
utf8 sourcePath[MAX_PATH];
Path::GetAbsolute(sourcePath, sizeof(sourcePath), rawSourcePath);
uint32_t sourceFileType = get_file_extension_type(sourcePath);
const auto sourcePath = Path::GetAbsolute(rawSourcePath);
uint32_t sourceFileType = get_file_extension_type(sourcePath.c_str());
// Get the destination path
const utf8* rawDestinationPath;
@@ -53,9 +52,8 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
return EXITCODE_FAIL;
}
utf8 destinationPath[MAX_PATH];
Path::GetAbsolute(destinationPath, sizeof(sourcePath), rawDestinationPath);
uint32_t destinationFileType = get_file_extension_type(destinationPath);
const auto destinationPath = Path::GetAbsolute(rawDestinationPath);
uint32_t destinationFileType = get_file_extension_type(destinationPath.c_str());
// Validate target type
if (destinationFileType != FILE_EXTENSION_PARK)
@@ -101,7 +99,7 @@ exitcode_t CommandLine::HandleCommandConvert(CommandLineArgEnumerator* enumerato
try
{
auto importer = ParkImporter::Create(sourcePath);
auto loadResult = importer->Load(sourcePath);
auto loadResult = importer->Load(sourcePath.c_str());
objManager.LoadObjects(loadResult.RequiredObjects);