From 67d51c35846e336721ba9e69ae0cb4e411047acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 10 Aug 2023 14:38:35 +0300
Subject: [PATCH] Use u8string for ScenarioIndexEntry Path

---
 src/openrct2/scenario/ScenarioRepository.cpp | 12 ++++++------
 src/openrct2/scenario/ScenarioRepository.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp
index 88be26c914..b563c3ede3 100644
--- a/src/openrct2/scenario/ScenarioRepository.cpp
+++ b/src/openrct2/scenario/ScenarioRepository.cpp
@@ -204,10 +204,10 @@ private:
                 {
                     auto& objRepository = OpenRCT2::GetContext()->GetObjectRepository();
                     auto importer = ParkImporter::CreateParkFile(objRepository);
-                    importer->LoadScenario(path.c_str(), true);
+                    importer->LoadScenario(path, true);
                     if (importer->GetDetails(entry))
                     {
-                        String::Set(entry->Path, sizeof(entry->Path), path.c_str());
+                        entry->Path = path;
                         entry->Timestamp = timestamp;
                         result = true;
                     }
@@ -225,10 +225,10 @@ private:
                 try
                 {
                     auto s4Importer = ParkImporter::CreateS4();
-                    s4Importer->LoadScenario(path.c_str(), true);
+                    s4Importer->LoadScenario(path, true);
                     if (s4Importer->GetDetails(entry))
                     {
-                        String::Set(entry->Path, sizeof(entry->Path), path.c_str());
+                        entry->Path = path;
                         entry->Timestamp = timestamp;
                         result = true;
                     }
@@ -273,7 +273,7 @@ private:
         ScenarioIndexEntry entry = {};
 
         // Set new entry
-        String::Set(entry.Path, sizeof(entry.Path), path.c_str());
+        entry.Path = path;
         entry.Timestamp = timestamp;
         entry.Category = s6Info->Category;
         entry.ObjectiveType = s6Info->ObjectiveType;
@@ -562,7 +562,7 @@ private:
                 if (existingEntry->Timestamp > entry.Timestamp)
                 {
                     // Existing entry is more recent
-                    conflictPath = String::ToStd(existingEntry->Path);
+                    conflictPath = existingEntry->Path;
 
                     // Overwrite existing entry with this one
                     *existingEntry = entry;
diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h
index f887147ee0..ea309cef2a 100644
--- a/src/openrct2/scenario/ScenarioRepository.h
+++ b/src/openrct2/scenario/ScenarioRepository.h
@@ -42,7 +42,7 @@ enum class ScenarioSource : uint8_t
 
 struct ScenarioIndexEntry
 {
-    utf8 Path[MAX_PATH];
+    u8string Path;
     uint64_t Timestamp;
 
     // Category / sequence