Use different name table offset depending on staff type (OpenRCT2#22813)

733737 · Sep 25, 2024 · 81b759e · 81b759e
1 parent 04bdff0
commit 81b759e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
@@ -1608,7 +1608,14 @@ void Peep::FormatNameTo(Formatter& ft) const
 
         if ((!isStaff && showGuestNames) || (isStaff && showStaffNames))
         {
-            auto realNameStringId = GetRealNameStringIDFromPeepID(PeepId);
+            auto nameId = PeepId;
+            if (isStaff)
+            {
+                // Prevent staff from getting the same names by offsetting the name table based on staff type.
+                nameId *= 256 * EnumValue(staff->AssignedStaffType) + 1;
+            }
+
+            auto realNameStringId = GetRealNameStringIDFromPeepID(nameId);
             ft.Add<StringId>(realNameStringId);
         }
         else if (isStaff)