From 1c26a6cb419cbc704b5e10c75fd64907f199d312 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Fri, 12 Jul 2024 23:39:59 +0200
Subject: [PATCH] Move RealNames.cpp,h from localisation to peep folder

---
 src/openrct2/entity/Peep.cpp                  |  2 +-
 src/openrct2/libopenrct2.vcxproj              |  3 ++-
 src/openrct2/localisation/Formatting.cpp      |  1 +
 src/openrct2/localisation/Localisation.h      |  7 -------
 .../{localisation => peep}/RealNames.cpp      |  2 +-
 src/openrct2/peep/RealNames.h                 | 19 +++++++++++++++++++
 6 files changed, 24 insertions(+), 10 deletions(-)
 rename src/openrct2/{localisation => peep}/RealNames.cpp (99%)
 create mode 100644 src/openrct2/peep/RealNames.h

diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index 1a796e8ea1..d5d5bfd8a3 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -29,7 +29,6 @@
 #include "../interface/Window_internal.h"
 #include "../localisation/Formatter.h"
 #include "../localisation/Formatting.h"
-#include "../localisation/Localisation.h"
 #include "../management/Finance.h"
 #include "../management/Marketing.h"
 #include "../management/NewsItem.h"
@@ -38,6 +37,7 @@
 #include "../peep/GuestPathfinding.h"
 #include "../peep/PeepAnimationData.h"
 #include "../peep/PeepSpriteIds.h"
+#include "../peep/RealNames.h"
 #include "../profiling/Profiling.h"
 #include "../ride/Ride.h"
 #include "../ride/RideData.h"
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index 721609f1e9..acf6bc1e80 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -382,6 +382,7 @@
     <ClInclude Include="peep\GuestPathfinding.h" />
     <ClInclude Include="peep\PeepAnimationData.h" />
     <ClInclude Include="peep\PeepSpriteIds.h" />
+    <ClInclude Include="peep\RealNames.h" />
     <ClInclude Include="peep\RideUseSystem.h" />
     <ClInclude Include="PlatformEnvironment.h" />
     <ClInclude Include="platform\Crash.h" />
@@ -822,7 +823,6 @@
     <ClCompile Include="localisation\Localisation.cpp" />
     <ClCompile Include="localisation\Localisation.Date.cpp" />
     <ClCompile Include="localisation\LocalisationService.cpp" />
-    <ClCompile Include="localisation\RealNames.cpp" />
     <ClCompile Include="management\Award.cpp" />
     <ClCompile Include="management\Finance.cpp" />
     <ClCompile Include="management\Marketing.cpp" />
@@ -897,6 +897,7 @@
     <ClCompile Include="park\ParkFile.cpp" />
     <ClCompile Include="peep\GuestPathfinding.cpp" />
     <ClCompile Include="peep\PeepAnimationData.cpp" />
+    <ClCompile Include="peep\RealNames.cpp" />
     <ClCompile Include="peep\RideUseSystem.cpp" />
     <ClCompile Include="PlatformEnvironment.cpp" />
     <ClCompile Include="platform\Crash.cpp" />
diff --git a/src/openrct2/localisation/Formatting.cpp b/src/openrct2/localisation/Formatting.cpp
index 648b5d8ca2..1aaee0a03b 100644
--- a/src/openrct2/localisation/Formatting.cpp
+++ b/src/openrct2/localisation/Formatting.cpp
@@ -10,6 +10,7 @@
 #include "Formatting.h"
 
 #include "../config/Config.h"
+#include "../peep/RealNames.h"
 #include "../util/Util.h"
 #include "Currency.h"
 #include "FormatCodes.h"
diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h
index 06bff653b2..33f8a8f64e 100644
--- a/src/openrct2/localisation/Localisation.h
+++ b/src/openrct2/localisation/Localisation.h
@@ -19,15 +19,8 @@ void FormatStringToUpper(char* dest, size_t size, StringId format, const void* a
 
 constexpr size_t kUserStringMaxLength = 32;
 
-constexpr uint16_t kRealNameStart = 0xA000;
-constexpr uint16_t kRealNameEnd = 0xDFFF;
-
 constexpr size_t CommonTextBufferSize = 512;
 
-// Real name data
-extern const char real_name_initials[16];
-extern const char* real_names[1024];
-
 extern thread_local char gCommonStringFormatBuffer[CommonTextBufferSize];
 
 extern const StringId ObjectiveNames[12];
diff --git a/src/openrct2/localisation/RealNames.cpp b/src/openrct2/peep/RealNames.cpp
similarity index 99%
rename from src/openrct2/localisation/RealNames.cpp
rename to src/openrct2/peep/RealNames.cpp
index 33945502cc..1214de0f8b 100644
--- a/src/openrct2/localisation/RealNames.cpp
+++ b/src/openrct2/peep/RealNames.cpp
@@ -7,7 +7,7 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "Localisation.h"
+#include "RealNames.h"
 
 const char real_name_initials[] = {
     'B', 'C', 'D', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'R', 'S', 'T', 'W',
diff --git a/src/openrct2/peep/RealNames.h b/src/openrct2/peep/RealNames.h
new file mode 100644
index 0000000000..039b82dca2
--- /dev/null
+++ b/src/openrct2/peep/RealNames.h
@@ -0,0 +1,19 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2024 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#pragma once
+
+#include <cstdint>
+
+constexpr uint16_t kRealNameStart = 0xA000;
+constexpr uint16_t kRealNameEnd = 0xDFFF;
+
+// Real name data
+extern const char real_name_initials[16];
+extern const char* real_names[1024];