Renamed OutdoorLocationTileType -> OutdoorTileType

captainurist · Nov 10, 2024 · 0f23462 · 0f23462
1 parent d4b5373
commit 0f23462
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/Engine/Graphics/OutdoorTerrain.h b/src/Engine/Graphics/OutdoorTerrain.h
@@ -9,7 +9,7 @@
 
 #include "Media/Audio/SoundEnums.h"
 
-struct OutdoorLocationTileType {
+struct OutdoorTileType {
     TileSet tileset = TILE_SET_INVALID;
     uint16_t uTileID = 0;
 };
@@ -39,7 +39,7 @@ class OutdoorTerrain {
      */
     SoundId soundIdByGrid(Vec2i gridPos, bool isRunning);
 
-    std::array<OutdoorLocationTileType, 4> pTileTypes;  // [3] is road tileset.
+    std::array<OutdoorTileType, 4> pTileTypes;  // [3] is road tileset.
     std::array<uint8_t, 128 * 128> pHeightmap = {};
     std::array<uint8_t, 128 * 128> pTilemap = {};
     std::array<uint8_t, 128 * 128> pAttributemap = {};

diff --git a/src/Engine/Snapshots/CompositeSnapshots.h b/src/Engine/Snapshots/CompositeSnapshots.h
@@ -84,7 +84,7 @@ struct OutdoorLocation_MM7 {
     std::array<char, 32> desciption;
     std::array<char, 32> skyTexture;
     std::array<char, 32> groundTilesetUnused;
-    std::array<OutdoorLocationTileType_MM7, 4> tileTypes;
+    std::array<OutdoorTileType_MM7, 4> tileTypes;
     std::array<uint8_t, 128 * 128> heightMap;
     std::array<uint8_t, 128 * 128> tileMap;
     std::array<uint8_t, 128 * 128> attributeMap;

diff --git a/src/Engine/Snapshots/EntitySnapshots.cpp b/src/Engine/Snapshots/EntitySnapshots.cpp
@@ -1797,7 +1797,7 @@ void reconstruct(const PersistentVariables_MM7 &src, PersistentVariables *dst) {
     dst->decorVars = src.decorVars;
 }
 
-void reconstruct(const OutdoorLocationTileType_MM7 &src, OutdoorLocationTileType *dst) {
+void reconstruct(const OutdoorTileType_MM7 &src, OutdoorTileType *dst) {
     dst->tileset = static_cast<TileSet>(src.tileset);
     dst->uTileID = src.tileId;
 }

diff --git a/src/Engine/Snapshots/EntitySnapshots.h b/src/Engine/Snapshots/EntitySnapshots.h
@@ -50,7 +50,7 @@ struct MonsterDesc;
 struct NPCData;
 struct ODMFace;
 struct ObjectDesc;
-struct OutdoorLocationTileType;
+struct OutdoorTileType;
 struct OverlayDesc;
 struct Party;
 struct PersistentVariables;
@@ -1353,14 +1353,14 @@ MM_DECLARE_MEMCOPY_SERIALIZABLE(BLVHeader_MM7)
 // so no reconstruct() overloads for it.
 
 
-struct OutdoorLocationTileType_MM7 {
+struct OutdoorTileType_MM7 {
     uint16_t tileset;
     uint16_t tileId;
 };
-static_assert(sizeof(OutdoorLocationTileType_MM7) == 4);
-MM_DECLARE_MEMCOPY_SERIALIZABLE(OutdoorLocationTileType_MM7)
+static_assert(sizeof(OutdoorTileType_MM7) == 4);
+MM_DECLARE_MEMCOPY_SERIALIZABLE(OutdoorTileType_MM7)
 
-void reconstruct(const OutdoorLocationTileType_MM7 &src, OutdoorLocationTileType *dst);
+void reconstruct(const OutdoorTileType_MM7 &src, OutdoorTileType *dst);
 
 
 struct SaveGameHeader_MM7 {