diff --git a/src/Engine/Graphics/OutdoorTerrain.h b/src/Engine/Graphics/OutdoorTerrain.h index 61cf5511578a..f5e50077bf9e 100644 --- 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 pTileTypes; // [3] is road tileset. + std::array pTileTypes; // [3] is road tileset. std::array pHeightmap = {}; std::array pTilemap = {}; std::array pAttributemap = {}; diff --git a/src/Engine/Snapshots/CompositeSnapshots.h b/src/Engine/Snapshots/CompositeSnapshots.h index 901e4d54ab75..3103939a4588 100644 --- a/src/Engine/Snapshots/CompositeSnapshots.h +++ b/src/Engine/Snapshots/CompositeSnapshots.h @@ -84,7 +84,7 @@ struct OutdoorLocation_MM7 { std::array desciption; std::array skyTexture; std::array groundTilesetUnused; - std::array tileTypes; + std::array tileTypes; std::array heightMap; std::array tileMap; std::array attributeMap; diff --git a/src/Engine/Snapshots/EntitySnapshots.cpp b/src/Engine/Snapshots/EntitySnapshots.cpp index 62473e856a25..6c33f2f39756 100644 --- 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(src.tileset); dst->uTileID = src.tileId; } diff --git a/src/Engine/Snapshots/EntitySnapshots.h b/src/Engine/Snapshots/EntitySnapshots.h index 066fbd1c3103..62e0d23d8269 100644 --- 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 {