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

Refactor struct TrackDesignFileRef

Browse Source 
- Refactors track_design_file_ref to TrackDesignFileRef and replaces the utf8* fields of that struct with u8string
- Gets rid of some String::Duplicate() and delete calls
- Uses a bunch of c_str() calls to interface with older functions
This commit is contained in:
Raymond Zhao
2022-07-26 09:12:46 -07:00
committed by GitHub
parent 68ded02b14
commit 4f23e5e9ec
8 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -170,9 +170,9 @@ public:
* @param entry The entry name to build a track list for. Leave empty to build track list for the non-separated types (e.g.
* Hyper-Twister, Car Ride)
*/
std::vector<track_design_file_ref> GetItemsForObjectEntry(uint8_t rideType, const std::string& entry) const override
std::vector<TrackDesignFileRef> GetItemsForObjectEntry(uint8_t rideType, const std::string& entry) const override
{
std::vector<track_design_file_ref> refs;
std::vector<TrackDesignFileRef> refs;
const auto& repo = GetContext()->GetObjectRepository();
for (const auto& item : _items)
@@ -193,9 +193,9 @@ public:
if (entryIsNotSeparate || String::Equals(item.ObjectEntry, entry, true))
{
track_design_file_ref ref;
ref.name = String::Duplicate(GetNameFromTrackPath(item.Path));
ref.path = String::Duplicate(item.Path);
TrackDesignFileRef ref;
ref.name = GetNameFromTrackPath(item.Path);
ref.path = item.Path;
refs.push_back(ref);
}
}
@@ -324,20 +324,20 @@ void track_repository_scan()
repo->Scan(LocalisationService_GetCurrentLanguage());
}
bool track_repository_delete(const utf8* path)
bool track_repository_delete(const u8string& path)
{
ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository();
return repo->Delete(path);
}
bool track_repository_rename(const utf8* path, const utf8* newName)
bool track_repository_rename(const u8string& path, const u8string& newName)
{
ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository();
std::string newPath = repo->Rename(path, newName);
return !newPath.empty();
}
bool track_repository_install(const utf8* srcPath, const utf8* name)
bool track_repository_install(const u8string& srcPath, const u8string& name)
{
ITrackDesignRepository* repo = GetContext()->GetTrackDesignRepository();
std::string newPath = repo->Install(srcPath, name);