make names more consistent

spacek531 · May 13, 2024 · 67bd23e · 67bd23e
1 parent cf97eb7
commit 67bd23e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 339 deletions.
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
@@ -339,7 +339,7 @@
     <ClInclude Include="object\ObjectTypes.h" />
     <ClInclude Include="object\ResourceTable.h" />
     <ClInclude Include="object\RideObject.h" />
-    <ClInclude Include="object\SceneryBoundingBox.h" />
+    <ClInclude Include="object\SceneryBoundbox.h" />
     <ClInclude Include="object\SceneryGroupEntry.h" />
     <ClInclude Include="object\SceneryGroupObject.h" />
     <ClInclude Include="object\SceneryObject.h" />
@@ -843,7 +843,7 @@
     <ClCompile Include="object\ObjectTypes.cpp" />
     <ClCompile Include="object\ResourceTable.cpp" />
     <ClCompile Include="object\RideObject.cpp" />
-    <ClCompile Include="object\SceneryBoundingBox.cpp" />
+    <ClCompile Include="object\SceneryBoundbox.cpp" />
     <ClCompile Include="object\SceneryGroupObject.cpp" />
     <ClCompile Include="object\SmallSceneryObject.cpp" />
     <ClCompile Include="object\StationObject.cpp" />

diff --git a/src/openrct2/object/LargeSceneryEntry.h b/src/openrct2/object/LargeSceneryEntry.h
@@ -24,7 +24,7 @@ struct LargeSceneryTile
     uint8_t z_clearance;
     // CCCC WWWW 0SS0 0000
     uint16_t flags;
-    SceneryBoundBoxes boundBoxes = {};
+    SceneryBoundboxes boundBoxes = {};
     CoordsXYZ spriteOffset = {};
 };
 

diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp
@@ -19,28 +19,28 @@
 #include "../localisation/Language.h"
 #include "../world/Banner.h"
 #include "../world/Location.hpp"
-#include "SceneryBoundingBox.h"
+#include "SceneryBoundbox.h"
 
 #include <algorithm>
 #include <iterator>
 
-static DefaultBoundingBoxType boundBoxTypes[16] = {
-    DefaultBoundingBoxType::FullTileBox,              // 0000
-    DefaultBoundingBoxType::FullTileSouthQuadrantBox, // 0001
-    DefaultBoundingBoxType::FullTileWestQuadrantBox,  // 0010
-    DefaultBoundingBoxType::FullTileSouthwestSideBox, // 0011
-    DefaultBoundingBoxType::FullTileNorthQuadrantBox, // 0100
-    DefaultBoundingBoxType::FullTileBox,              // 0101 (diagonal of South and North corners)
-    DefaultBoundingBoxType::FullTileNorthwestSideBox, // 0110
-    DefaultBoundingBoxType::FullTileBox,              // 0111 (triangle of South, West, and North corners)
-    DefaultBoundingBoxType::FullTileEastQuadrantBox,  // 1000
-    DefaultBoundingBoxType::FullTileSoutheastSideBox, // 1001
-    DefaultBoundingBoxType::FullTileBox,              // 1010 (diagonal of East and West corners)
-    DefaultBoundingBoxType::FullTileBox,              // 1011 (triangle of South, West, and East corners)
-    DefaultBoundingBoxType::FullTileNortheastSideBox, // 1100
-    DefaultBoundingBoxType::FullTileBox,              // 1101 (triangle of South, West, and North corners)
-    DefaultBoundingBoxType::FullTileBox,              // 1110 (triangle of West, North, and East corners)
-    DefaultBoundingBoxType::FullTileBox,              // 1111
+static DefaultBoundBoxType boundBoxTypes[16] = {
+    DefaultBoundBoxType::FullTileBox,              // 0000
+    DefaultBoundBoxType::FullTileSouthQuadrantBox, // 0001
+    DefaultBoundBoxType::FullTileWestQuadrantBox,  // 0010
+    DefaultBoundBoxType::FullTileSouthwestSideBox, // 0011
+    DefaultBoundBoxType::FullTileNorthQuadrantBox, // 0100
+    DefaultBoundBoxType::FullTileBox,              // 0101 (diagonal of South and North corners)
+    DefaultBoundBoxType::FullTileNorthwestSideBox, // 0110
+    DefaultBoundBoxType::FullTileBox,              // 0111 (triangle of South, West, and North corners)
+    DefaultBoundBoxType::FullTileEastQuadrantBox,  // 1000
+    DefaultBoundBoxType::FullTileSoutheastSideBox, // 1001
+    DefaultBoundBoxType::FullTileBox,              // 1010 (diagonal of East and West corners)
+    DefaultBoundBoxType::FullTileBox,              // 1011 (triangle of South, West, and East corners)
+    DefaultBoundBoxType::FullTileNortheastSideBox, // 1100
+    DefaultBoundBoxType::FullTileBox,              // 1101 (triangle of South, West, and North corners)
+    DefaultBoundBoxType::FullTileBox,              // 1110 (triangle of West, North, and East corners)
+    DefaultBoundBoxType::FullTileBox,              // 1111
 };
 
 static int32_t getBoundBoxHeight(uint8_t clearanceHeight)
@@ -56,7 +56,7 @@ static void SetTileBoundingBox(LargeSceneryTile& tile)
     }
     else
     {
-        tile.boundBoxes = GetDefaultSceneryBoundBoxes(DefaultBoundingBoxType::FullTileLargeBox);
+        tile.boundBoxes = GetDefaultSceneryBoundBoxes(DefaultBoundBoxType::FullTileLargeBox);
     }
     tile.spriteOffset = GetDefaultSpriteOffset(DefaultSpriteOffsetType::LargeSceneryOffset);
 

diff --git a/src/openrct2/object/SceneryBoundingBox.cpp b/src/openrct2/object/SceneryBoundingBox.cpp
diff --git a/src/openrct2/object/SceneryBoundingBox.h b/src/openrct2/object/SceneryBoundingBox.h