diff --git a/lib/Terrain.cpp b/lib/Terrain.cpp index ea42f3774..fff98de34 100644 --- a/lib/Terrain.cpp +++ b/lib/Terrain.cpp @@ -397,30 +397,6 @@ TerrainType::TerrainType(const std::string& _name): transitionRequired(false) { } - -TerrainType& TerrainType::operator=(const TerrainType & other) -{ - battleFields = other.battleFields; - prohibitTransitions = other.prohibitTransitions; - minimapBlocked = other.minimapBlocked; - minimapUnblocked = other.minimapUnblocked; - name = other.name; - musicFilename = other.musicFilename; - tilesFilename = other.tilesFilename; - terrainText = other.terrainText; - typeCode = other.typeCode; - terrainViewPatterns = other.terrainViewPatterns; - rockTerrain = other.rockTerrain; - river = other.river; - - id = other.id; - moveCost = other.moveCost; - horseSoundId = other.horseSoundId; - passabilityType = other.passabilityType; - transitionRequired = other.transitionRequired; - - return *this; -} bool TerrainType::operator==(const TerrainType& other) { @@ -474,16 +450,6 @@ RiverType::RiverType(const std::string & fileName, const std::string & code, Riv { } -RiverType& RiverType::operator=(const RiverType& other) -{ - fileName = other.fileName; - code = other.code; - deltaName = other.deltaName; - id = other.id; - - return *this; -} - RoadType::RoadType(const std::string& fileName, const std::string& code, RoadId id): fileName(fileName), code(code), @@ -492,14 +458,4 @@ RoadType::RoadType(const std::string& fileName, const std::string& code, RoadId { } -RoadType& RoadType::operator=(const RoadType& other) -{ - fileName = other.fileName; - code = other.code; - id = other.id; - movementCost = other.movementCost; - - return *this; -} - -VCMI_LIB_NAMESPACE_END \ No newline at end of file +VCMI_LIB_NAMESPACE_END diff --git a/lib/Terrain.h b/lib/Terrain.h index a4aae7b8a..6e23a9ca2 100644 --- a/lib/Terrain.h +++ b/lib/Terrain.h @@ -49,8 +49,6 @@ public: bool transitionRequired; TerrainType(const std::string & name = ""); - - TerrainType& operator=(const TerrainType & other); bool operator==(const TerrainType & other); bool operator!=(const TerrainType & other); @@ -99,8 +97,6 @@ public: RiverType(const std::string & fileName = "", const std::string & code = "", RiverId id = River::NO_RIVER); - RiverType& operator=(const RiverType & other); - template void serialize(Handler& h, const int version) { h & fileName; @@ -120,8 +116,6 @@ public: RoadType(const std::string & fileName = "", const std::string& code = "", RoadId id = Road::NO_ROAD); - RoadType& operator=(const RoadType & other); - template void serialize(Handler& h, const int version) { h & fileName;