Make MetalSupportGraphic internal to MetalSupports.cpp

2026-01-16 03:23:15 +01:00 · 2024-08-17 17:21:25 +02:00
parent 64dea4cd5d
commit 7d24e2ee39
2 changed files with 61 additions and 61 deletions
--- a/src/openrct2/paint/support/MetalSupports.cpp
+++ b/src/openrct2/paint/support/MetalSupports.cpp
@@ -21,6 +21,56 @@ using namespace OpenRCT2;

 constexpr auto kMetalSupportSkip = 9 * 4 * 2;

+// There are 13 types of metal support graphics, including rotated versions. A graphic showing all of them is available here:
+// https://cloud.githubusercontent.com/assets/737603/19420485/7eaba28e-93ec-11e6-83cb-03190accc094.png
+enum class MetalSupportGraphic : uint8_t
+{
+    /**
+     * Used by the Steel Twister, Looping RC, and other rides.
+     */
+    Tubes = 0,
+    /**
+     * Used by the Junior RC and other rides.
+     */
+    Fork = 1,
+    /**
+     * Rotated version of `Fork`.
+     */
+    ForkAlt = 2,
+    /**
+     * Used by the vertical roller coasters, the Log Flume and other rides.
+     */
+    Boxed = 3,
+    /**
+     * Used by the Steeplechase.
+     */
+    Stick = 4,
+    /**
+     * No visible difference from `Stick`, also used by the Steeplechase
+     */
+    StickAlt = 5,
+    /**
+     * Every “Thick” type seems to be used for the Looping Roller Coaster’s loop, and only for that specific part.
+     */
+    ThickCentred = 6,
+    Thick = 7,
+    ThickAlt = 8,
+    ThickAltCentred = 9,
+    /**
+     * Used by the chairlift.
+     */
+    Truss = 10,
+    /**
+     * Used by inverted rcs like the flying, lay-down, compact inverted.
+     * Mostly the same as `Tubes`, but with a thinner crossbeam.
+     */
+    TubesInverted = 11,
+    /**
+     * Does not seem to be used in RCT2, but it was used in RCT1 for one of the path support types.
+     */
+    BoxedCoated,
+};
+
 /** rct2: 0x0097AF20, 0x0097AF21 */
 // clang-format off
 static constexpr CoordsXY SupportBoundBoxes[] = {
@@ -230,6 +280,14 @@ constexpr MetalSupportGraphic kMetalSupportGraphicRotated[kMetalSupportTypeCount
      MetalSupportGraphic::BoxedCoated },
 };

+static bool MetalASupportsPaintSetup(
+    PaintSession& session, MetalSupportGraphic supportTypeMember, MetalSupportPlace placement, int32_t special, int32_t height,
+    ImageId imageTemplate);
+static bool MetalBSupportsPaintSetup(
+    PaintSession& session, MetalSupportGraphic supportTypeMember, MetalSupportPlace placement, int32_t special, int32_t height,
+    ImageId imageTemplate);
+static inline MetalSupportGraphic RotateMetalSupportGraphic(MetalSupportType supportType, Direction direction);
+
 /**
 * Metal pole supports
 * @param supportType (edi)
@@ -239,7 +297,7 @@ constexpr MetalSupportGraphic kMetalSupportGraphicRotated[kMetalSupportTypeCount
 * @param imageTemplate (ebp)
 *  rct2: 0x00663105
 */
-bool MetalASupportsPaintSetup(
+static bool MetalASupportsPaintSetup(
    PaintSession& session, MetalSupportGraphic supportTypeMember, MetalSupportPlace placement, int32_t special, int32_t height,
    ImageId imageTemplate)
 {
@@ -453,7 +511,7 @@ bool MetalASupportsPaintSetupRotated(
 *
 * @return (Carry Flag)
 */
-bool MetalBSupportsPaintSetup(
+static bool MetalBSupportsPaintSetup(
    PaintSession& session, MetalSupportGraphic supportTypeMember, MetalSupportPlace placement, int32_t special, int32_t height,
    ImageId imageTemplate)
 {
@@ -641,7 +699,7 @@ bool MetalBSupportsPaintSetupRotated(
    return MetalBSupportsPaintSetup(session, supportGraphic, placement, special, height, imageTemplate);
 }

-MetalSupportGraphic RotateMetalSupportGraphic(MetalSupportType supportType, Direction direction)
+static inline MetalSupportGraphic RotateMetalSupportGraphic(MetalSupportType supportType, Direction direction)
 {
    return kMetalSupportGraphicRotated[EnumValue(supportType)][direction];
 }
--- a/src/openrct2/paint/support/MetalSupports.h
+++ b/src/openrct2/paint/support/MetalSupports.h
@@ -61,57 +61,6 @@ enum class MetalSupportType
 };
 constexpr uint8_t kMetalSupportTypeCount = 8;

-// There are 13 types of metal support graphics, including rotated versions. A graphic showing all of them is available here:
-// https://cloud.githubusercontent.com/assets/737603/19420485/7eaba28e-93ec-11e6-83cb-03190accc094.png
-// TODO Make this internal to MetalSupports.cpp
-enum class MetalSupportGraphic : uint8_t
-{
-    /**
-     * Used by the Steel Twister, Looping RC, and other rides.
-     */
-    Tubes = 0,
-    /**
-     * Used by the Junior RC and other rides.
-     */
-    Fork = 1,
-    /**
-     * Rotated version of `Fork`.
-     */
-    ForkAlt = 2,
-    /**
-     * Used by the vertical roller coasters, the Log Flume and other rides.
-     */
-    Boxed = 3,
-    /**
-     * Used by the Steeplechase.
-     */
-    Stick = 4,
-    /**
-     * No visible difference from `Stick`, also used by the Steeplechase
-     */
-    StickAlt = 5,
-    /**
-     * Every “Thick” type seems to be used for the Looping Roller Coaster’s loop, and only for that specific part.
-     */
-    ThickCentred = 6,
-    Thick = 7,
-    ThickAlt = 8,
-    ThickAltCentred = 9,
-    /**
-     * Used by the chairlift.
-     */
-    Truss = 10,
-    /**
-     * Used by inverted rcs like the flying, lay-down, compact inverted.
-     * Mostly the same as `Tubes`, but with a thinner crossbeam.
-     */
-    TubesInverted = 11,
-    /**
-     * Does not seem to be used in RCT2, but it was used in RCT1 for one of the path support types.
-     */
-    BoxedCoated,
-};
-
 /**
 * Tiles are rendered at a 45 degree angle, with the corners on the top, bottom, left and right.
 * This enum controls where the supports are rendered on the screen.
@@ -142,9 +91,6 @@ enum class MetalSupportPlace : uint8_t
 struct FootpathPaintInfo;
 struct PaintSession;

-bool MetalASupportsPaintSetup(
-    PaintSession& session, MetalSupportGraphic supportTypeMember, MetalSupportPlace placement, int32_t special, int32_t height,
-    ImageId imageTemplate);
 /** @deprecated */
 bool MetalASupportsPaintSetup(
    PaintSession& session, MetalSupportType supportType, MetalSupportPlace placement, int32_t special, int32_t height,
@@ -152,9 +98,6 @@ bool MetalASupportsPaintSetup(
 bool MetalASupportsPaintSetupRotated(
    PaintSession& session, MetalSupportType supportType, MetalSupportPlace placement, Direction direction, int32_t special,
    int32_t height, ImageId imageTemplate);
-bool MetalBSupportsPaintSetup(
-    PaintSession& session, MetalSupportGraphic supportTypeMember, MetalSupportPlace placement, int32_t special, int32_t height,
-    ImageId imageTemplate);
 /** @deprecated */
 bool MetalBSupportsPaintSetup(
    PaintSession& session, MetalSupportType supportType, MetalSupportPlace placement, int32_t special, int32_t height,
@@ -162,7 +105,6 @@ bool MetalBSupportsPaintSetup(
 bool MetalBSupportsPaintSetupRotated(
    PaintSession& session, MetalSupportType supportType, MetalSupportPlace placement, Direction direction, int32_t special,
    int32_t height, ImageId imageTemplate);
-MetalSupportGraphic RotateMetalSupportGraphic(MetalSupportType supportType, Direction direction);
 void DrawSupportsSideBySide(
    PaintSession& session, Direction direction, uint16_t height, ImageId colour, MetalSupportType type, int32_t special = 0);
 bool PathPoleSupportsPaintSetup(