Rename Addon into Object Part

src/fheroes2/castle/castle.cpp

@@ -1959,7 +1959,7 @@ int32_t Castle::getTileIndexToPlaceBoat() const
             return false;
         }
 
-        // Mark the tile as worthy to a place a boat if the main addon does not exist on this tile.
+        // Mark the tile as worthy to a place a boat if the main object part does not exist on this tile.
         // This means that all objects on this tile are not primary objects (like shadows or some parts of objects).
         return ( tile.getMainObjectPart()._objectIcnType == MP2::OBJ_ICN_TYPE_UNKNOWN || tile.isPassabilityTransparent() );
     };

src/fheroes2/gui/interface_gamearea.cpp

@@ -298,8 +298,8 @@ namespace
         // There is a tile below the current.
         const Maps::Tiles & tileBelow = world.GetTiles( x, y + 1 );
 
-        for ( const auto & lowerAddon : tileBelow.getTopLayerAddons() ) {
-            if ( lowerAddon._uid == uid ) {
+        for ( const auto & lowerPart : tileBelow.getTopObjectParts() ) {
+            if ( lowerPart._uid == uid ) {
                 // This is a tall object.
                 return true;
             }
@@ -646,7 +646,7 @@ void Interface::GameArea::Redraw( fheroes2::Image & dst, int flag, bool isPuzzle
     // High priority images are drawn after any other object on this tile.
     renderImagesOnTiles( dst, tileUnfit.highPriorityBottomImages, *this );
 
-    std::vector<const Maps::TilesAddon *> topLayerTallObjects;
+    std::vector<const Maps::ObjectPart *> topLayerTallObjects;
 
     // Expand  ROI to properly render very tall objects (1 tile - left and right; 2 tiles - bottom): Abandoned mine Ghosts, Flag on the Alchemist lab, and others.
     const int32_t roiExtraObjectsMaxX = std::min( maxX + 1, world.w() );
@@ -672,19 +672,19 @@ void Interface::GameArea::Redraw( fheroes2::Image & dst, int flag, bool isPuzzle
             // any other level 2 objects with the same UID.
 
             topLayerTallObjects.clear();
-            for ( const auto & addon : tile.getTopLayerAddons() ) {
-                if ( isTallTopLayerObject( x, y, addon._uid ) ) {
-                    topLayerTallObjects.emplace_back( &addon );
+            for ( const auto & part : tile.getTopObjectParts() ) {
+                if ( isTallTopLayerObject( x, y, part._uid ) ) {
+                    topLayerTallObjects.emplace_back( &part );
                 }
                 else {
-                    redrawTopLayerObject( tile, dst, isPuzzleDraw, *this, addon );
+                    redrawTopLayerObject( tile, dst, isPuzzleDraw, *this, part );
                 }
             }
 
             redrawTopLayerExtraObjects( tile, dst, isPuzzleDraw, *this );
 
-            for ( const auto * addon : topLayerTallObjects ) {
-                redrawTopLayerObject( tile, dst, isPuzzleDraw, *this, *addon );
+            for ( const auto * part : topLayerTallObjects ) {
+                redrawTopLayerObject( tile, dst, isPuzzleDraw, *this, *part );
             }
         }
     }

src/fheroes2/heroes/heroes_action.cpp

@@ -229,8 +229,8 @@ namespace
             objectUID = tile.getMainObjectPart()._uid;
         }
         else {
-            // In maps made by the original map editor the action object can be in the bottom layer addons.
-            for ( auto iter = tile.getBottomLayerAddons().rbegin(); iter != tile.getBottomLayerAddons().rend(); ++iter ) {
+            // In maps made by the original map editor the action object can be in the ground layer.
+            for ( auto iter = tile.getGroundObjectParts().rbegin(); iter != tile.getGroundObjectParts().rend(); ++iter ) {
                 if ( Maps::getObjectTypeByIcn( iter->_objectIcnType, iter->_imageIndex ) == objectType ) {
                     objectUID = iter->_uid;
                     break;

src/fheroes2/maps/map_format_helper.cpp

@@ -232,12 +232,12 @@ namespace Maps
             streamParts.emplace( tile.getMainObjectPart()._uid, tile.getMainObjectPart()._imageIndex );
         }
 
-        for ( const auto & addon : tile.getBottomLayerAddons() ) {
-            if ( addon._objectIcnType == MP2::OBJ_ICN_TYPE_ROAD ) {
-                roadParts.emplace( addon._uid, addon._imageIndex );
+        for ( const auto & part : tile.getGroundObjectParts() ) {
+            if ( part._objectIcnType == MP2::OBJ_ICN_TYPE_ROAD ) {
+                roadParts.emplace( part._uid, part._imageIndex );
             }
-            else if ( addon._objectIcnType == MP2::OBJ_ICN_TYPE_STREAM ) {
-                streamParts.emplace( addon._uid, addon._imageIndex );
+            else if ( part._objectIcnType == MP2::OBJ_ICN_TYPE_STREAM ) {
+                streamParts.emplace( part._uid, part._imageIndex );
             }
         }
 

src/fheroes2/maps/map_object_info.h

@@ -31,7 +31,7 @@
 namespace Maps
 {
     // An object usually contains of multiple parts / tiles. Each part has its own features like object layer type or image index.
-    // An object always contains a main object part (addon).
+    // An object always contains a main object part.
     // All object's parts shares images from the same ICN source (MP2::ObjectIcnType).
     struct ObjectPartInfo
     {
@@ -71,7 +71,7 @@ namespace Maps
             // Do nothing.
         }
 
-        // A layer where this object part / addon sits on.
+        // A layer where this object part sits on.
         // The layer is used for passability calculations as well as an order of rendering objects.
         ObjectLayerType layerType{ OBJECT_LAYER };
     };

src/fheroes2/maps/maps.cpp

@@ -484,12 +484,12 @@ Maps::Indexes Maps::GetObjectPositions( const MP2::MapObjectType objectType )
     return MapsIndexesObject( objectType, true );
 }
 
-std::vector<std::pair<int32_t, const Maps::TilesAddon *>> Maps::getObjectParts( const MP2::MapObjectType objectType )
+std::vector<std::pair<int32_t, const Maps::ObjectPart *>> Maps::getObjectParts( const MP2::MapObjectType objectType )
 {
-    std::vector<std::pair<int32_t, const TilesAddon *>> result;
+    std::vector<std::pair<int32_t, const ObjectPart *>> result;
     const int32_t size = static_cast<int32_t>( world.getSize() );
     for ( int32_t idx = 0; idx < size; ++idx ) {
-        const Maps::TilesAddon * objectPart = getObjectPartByActionType( world.GetTiles( idx ), objectType );
+        const Maps::ObjectPart * objectPart = getObjectPartByActionType( world.GetTiles( idx ), objectType );
         if ( objectPart != nullptr ) {
             result.emplace_back( idx, objectPart );
         }
@@ -725,10 +725,10 @@ void Maps::UpdateCastleSprite( const fheroes2::Point & center, int race, bool is
                 tile.updateObjectImageIndex( castleID, MP2::OBJ_ICN_TYPE_OBJNTOWN, -16 );
 
             if ( index == 0 ) {
-                TilesAddon * addon = tile.getTopLayerAddon( castleID );
-                if ( addon && addon->_objectIcnType == MP2::OBJ_ICN_TYPE_OBJNTWRD ) {
-                    addon->_objectIcnType = MP2::OBJ_ICN_TYPE_OBJNTOWN;
-                    addon->_imageIndex = fullTownIndex - 16;
+                ObjectPart * part = tile.getTopObjectPart( castleID );
+                if ( part && part->_objectIcnType == MP2::OBJ_ICN_TYPE_OBJNTWRD ) {
+                    part->_objectIcnType = MP2::OBJ_ICN_TYPE_OBJNTOWN;
+                    part->_imageIndex = fullTownIndex - 16;
                 }
             }
         }

src/fheroes2/maps/maps.h

@@ -41,7 +41,7 @@ using MapsIndexes = std::vector<int32_t>;
 
 namespace Maps
 {
-    struct TilesAddon;
+    struct ObjectPart;
 
     enum mapsize_t : int
     {
@@ -95,7 +95,7 @@ namespace Maps
     Indexes GetObjectPositions( const MP2::MapObjectType objectType );
 
     // This is a very slow function by performance. Use it only while loading a map.
-    std::vector<std::pair<int32_t, const TilesAddon *>> getObjectParts( const MP2::MapObjectType objectType );
+    std::vector<std::pair<int32_t, const ObjectPart *>> getObjectParts( const MP2::MapObjectType objectType );
 
     Indexes GetObjectPositions( int32_t center, const MP2::MapObjectType objectType, bool ignoreHeroes );