mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor struct TrackDesignFileRef 

- 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/WindowManager.cpp
View File

@ -245,7 +245,7 @@ public:
}
case WC_MANAGE_TRACK_DESIGN:
return WindowTrackManageOpen(
static_cast<track_design_file_ref*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
static_cast<TrackDesignFileRef*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
case WC_NETWORK_STATUS:
{
std::string message = intent->GetStringExtra(INTENT_EXTRA_MESSAGE);
@ -269,7 +269,7 @@ public:
}
case WC_TRACK_DESIGN_PLACE:
return WindowTrackPlaceOpen(
static_cast<track_design_file_ref*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
static_cast<TrackDesignFileRef*>(intent->GetPointerExtra(INTENT_EXTRA_TRACK_DESIGN)));
case WC_TRACK_DESIGN_LIST:
{
RideSelection rideItem;

11
src/openrct2-ui/windows/TrackDesignManage.cpp
View File

@ -22,6 +22,7 @@ static constexpr const int32_t WH = 44;
static constexpr const int32_t WW = 250;
static constexpr const int32_t WH_DELETE_PROMPT = 74;
static constexpr const int32_t WW_DELETE_PROMPT = 250;
static constexpr const int32_t TrackDesignNameMaxLength = 127;
#pragma region Widgets
@ -82,7 +83,7 @@ static rct_window_event_list window_track_delete_prompt_events([](auto& events)
#pragma endregion
static track_design_file_ref* _trackDesignFileReference;
static TrackDesignFileRef* _trackDesignFileReference;
static void WindowTrackDeletePromptOpen();
static void WindowTrackDesignListReloadTracks();
@ -91,7 +92,7 @@ static void WindowTrackDesignListReloadTracks();
*
* rct2: 0x006D348F
*/
rct_window* WindowTrackManageOpen(track_design_file_ref* tdFileRef)
rct_window* WindowTrackManageOpen(TrackDesignFileRef* tdFileRef)
{
window_close_by_class(WC_MANAGE_TRACK_DESIGN);
@ -139,7 +140,7 @@ static void WindowTrackManageMouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_RENAME:
WindowTextInputRawOpen(
w, widgetIndex, STR_TRACK_DESIGN_RENAME_TITLE, STR_TRACK_DESIGN_RENAME_DESC, {},
_trackDesignFileReference->name, 127);
_trackDesignFileReference->name.c_str(), TrackDesignNameMaxLength);
break;
case WIDX_DELETE:
WindowTrackDeletePromptOpen();
@ -188,7 +189,7 @@ static void WindowTrackManageTextinput(rct_window* w, rct_widgetindex widgetInde
*/
static void WindowTrackManagePaint(rct_window* w, rct_drawpixelinfo* dpi)
{
Formatter::Common().Add<char*>(_trackDesignFileReference->name);
Formatter::Common().Add<const utf8*>(_trackDesignFileReference->name.c_str());
WindowDrawWidgets(w, dpi);
}
@ -247,7 +248,7 @@ static void WindowTrackDeletePromptPaint(rct_window* w, rct_drawpixelinfo* dpi)
WindowDrawWidgets(w, dpi);
auto ft = Formatter();
ft.Add<const char*>(_trackDesignFileReference->name);
ft.Add<const utf8*>(_trackDesignFileReference->name.c_str());
DrawTextWrapped(
dpi, { w->windowPos.x + (WW_DELETE_PROMPT / 2), w->windowPos.y + ((WH_DELETE_PROMPT / 2) - 9) }, (WW_DELETE_PROMPT - 4),
STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK, ft, { TextAlignment::CENTRE });

4
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -611,9 +611,9 @@ private:
}
};
rct_window* WindowTrackPlaceOpen(const track_design_file_ref* tdFileRef)
rct_window* WindowTrackPlaceOpen(const TrackDesignFileRef* tdFileRef)
{
std::unique_ptr<TrackDesign> openTrackDesign = TrackDesignImport(tdFileRef->path);
std::unique_ptr<TrackDesign> openTrackDesign = TrackDesignImport(tdFileRef->path.c_str());
if (openTrackDesign == nullptr)
{

21
src/openrct2-ui/windows/TrackList.cpp
View File

@ -71,7 +71,7 @@ RideSelection _window_track_list_item;
class TrackListWindow final : public Window
{
private:
std::vector<track_design_file_ref> _trackDesigns;
std::vector<TrackDesignFileRef> _trackDesigns;
utf8 _filterString[USER_STRING_MAX_LENGTH];
std::vector<uint16_t> _filteredTrackIds;
uint16_t _loadedTrackDesignIndex;
@ -132,7 +132,7 @@ private:
}
uint16_t trackDesignIndex = _filteredTrackIds[listIndex];
track_design_file_ref* tdRef = &_trackDesigns[trackDesignIndex];
TrackDesignFileRef* tdRef = &_trackDesigns[trackDesignIndex];
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
{
auto intent = Intent(WC_MANAGE_TRACK_DESIGN);
@ -186,9 +186,9 @@ private:
FilterList();
}
bool LoadDesignPreview(utf8* path)
bool LoadDesignPreview(const u8string& path)
{
_loadedTrackDesign = TrackDesignImport(path);
_loadedTrackDesign = TrackDesignImport(path.c_str());
if (_loadedTrackDesign != nullptr)
{
TrackDesignDrawPreview(_loadedTrackDesign.get(), _trackDesignPreviewPixels.data());
@ -239,11 +239,6 @@ public:
_trackDesignPreviewPixels.shrink_to_fit();
// Dispose track list
for (auto& trackDesign : _trackDesigns)
{
delete trackDesign.name;
delete trackDesign.path;
}
_trackDesigns.clear();
// If gScreenAge is zero, we're already in the process
@ -462,14 +457,14 @@ public:
// Track preview
auto& tdWidget = widgets[WIDX_TRACK_PREVIEW];
int32_t colour = ColourMapA[colours[0]].darkest;
utf8* path = _trackDesigns[trackIndex].path;
u8string path = _trackDesigns[trackIndex].path;
// Show track file path (in debug mode)
if (gConfigGeneral.debugging_tools)
{
utf8 pathBuffer[MAX_PATH];
const utf8* pathPtr = pathBuffer;
shorten_path(pathBuffer, sizeof(pathBuffer), path, width, FontSpriteBase::MEDIUM);
shorten_path(pathBuffer, sizeof(pathBuffer), path.c_str(), width, FontSpriteBase::MEDIUM);
auto ft = Formatter();
ft.Add<utf8*>(pathPtr);
DrawTextBasic(
@ -533,7 +528,7 @@ public:
// Track design name
auto ft = Formatter();
ft.Add<utf8*>(_trackDesigns[trackIndex].name);
ft.Add<const utf8*>(_trackDesigns[trackIndex].name.c_str());
DrawTextEllipsised(&dpi, screenPos, 368, STR_TRACK_PREVIEW_NAME_FORMAT, ft, { TextAlignment::CENTRE });
// Information
@ -730,7 +725,7 @@ public:
// Draw track name
auto ft = Formatter();
ft.Add<rct_string_id>(STR_TRACK_LIST_NAME_FORMAT);
ft.Add<utf8*>(_trackDesigns[i].name);
ft.Add<const utf8*>(_trackDesigns[i].name.c_str());
DrawTextBasic(&dpi, screenCoords - ScreenCoordsXY{ 0, 1 }, stringId, ft);
}

4
src/openrct2-ui/windows/Window.h
View File

@ -108,8 +108,8 @@ struct TrackDesign;
rct_window* WindowLoadsaveOpen(
int32_t type, std::string_view defaultPath, std::function<void(int32_t result, std::string_view)> callback,
TrackDesign* trackDesign);
rct_window* WindowTrackPlaceOpen(const struct track_design_file_ref* tdFileRef);
rct_window* WindowTrackManageOpen(struct track_design_file_ref* tdFileRef);
rct_window* WindowTrackPlaceOpen(const struct TrackDesignFileRef* tdFileRef);
rct_window* WindowTrackManageOpen(struct TrackDesignFileRef* tdFileRef);
void TrackPlaceClearProvisionalTemporarily();
void TrackPlaceRestoreProvisional();

2
src/openrct2/interface/Window.h
View File

@ -26,7 +26,7 @@
struct rct_drawpixelinfo;
struct rct_window;
union rct_window_event;
struct track_design_file_ref;
struct TrackDesignFileRef;
struct TextInputSession;
struct scenario_index_entry;

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);

21
src/openrct2/ride/TrackDesignRepository.h
View File

@ -13,16 +13,15 @@
#include "../core/String.hpp"
#include <memory>
struct track_design_file_ref
{
utf8* name;
utf8* path;
};
#include <string>
#include <vector>
struct TrackDesignFileRef
{
u8string name;
u8string path;
};
namespace OpenRCT2
{
struct IPlatformEnvironment;
@ -34,7 +33,7 @@ struct ITrackDesignRepository
[[nodiscard]] virtual size_t GetCount() const abstract;
[[nodiscard]] virtual size_t GetCountForObjectEntry(uint8_t rideType, const std::string& entry) const abstract;
[[nodiscard]] virtual std::vector<track_design_file_ref> GetItemsForObjectEntry(
[[nodiscard]] virtual std::vector<TrackDesignFileRef> GetItemsForObjectEntry(
uint8_t rideType, const std::string& entry) const abstract;
virtual void Scan(int32_t language) abstract;
@ -48,6 +47,6 @@ struct ITrackDesignRepository
[[nodiscard]] std::string GetNameFromTrackPath(const std::string& path);
void track_repository_scan();
bool track_repository_delete(const utf8* path);
bool track_repository_rename(const utf8* path, const utf8* newName);
bool track_repository_install(const utf8* srcPath, const utf8* name);
bool track_repository_delete(const u8string& path);
bool track_repository_rename(const u8string& path, const u8string& newName);
bool track_repository_install(const u8string& srcPath, const u8string& name);