From 4c2d67eb4561bb2e22aec7096695ab2f9acf9efc Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 7 Jul 2025 19:50:52 +0300 Subject: [PATCH] Fix build --- lib/mapObjects/army/CCreatureSet.cpp | 6 ------ lib/mapObjects/army/CCreatureSet.h | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/mapObjects/army/CCreatureSet.cpp b/lib/mapObjects/army/CCreatureSet.cpp index 2e0683cc4..1d9bf3fa6 100644 --- a/lib/mapObjects/army/CCreatureSet.cpp +++ b/lib/mapObjects/army/CCreatureSet.cpp @@ -637,12 +637,6 @@ bool CCreatureSet::hasStackAtSlot(const SlotID & slot) const return vstd::contains(stacks, slot); } -CCreatureSet & CCreatureSet::operator=(const CCreatureSet & cs) -{ - assert(0); - return *this; -} - void CCreatureSet::armyChanged() {} void CCreatureSet::serializeJson(JsonSerializeFormat & handler, const std::string & armyFieldName, const std::optional fixedSize) diff --git a/lib/mapObjects/army/CCreatureSet.h b/lib/mapObjects/army/CCreatureSet.h index 933e6fc14..d208a52b1 100644 --- a/lib/mapObjects/army/CCreatureSet.h +++ b/lib/mapObjects/army/CCreatureSet.h @@ -10,6 +10,7 @@ #pragma once #include "CSimpleArmy.h" +#include "CStackInstance.h" #include "serializer/Serializeable.h" @@ -37,10 +38,10 @@ namespace NArmyFormation static const std::vector names{"wide", "tight"}; } -class DLL_LINKAGE CCreatureSet : public IArmyDescriptor, public virtual Serializeable //seven combined creatures +class DLL_LINKAGE CCreatureSet : public IArmyDescriptor, public virtual Serializeable, boost::noncopyable //seven combined creatures { CCreatureSet(const CCreatureSet &) = delete; - CCreatureSet & operator=(const CCreatureSet &); + CCreatureSet & operator=(const CCreatureSet &) = delete; public: TSlots stacks; //slots[slot_id]->> pair(creature_id,creature_quantity)