Ivan Savenko 3 ماه پیش
والد
کامیت
4c2d67eb45
2فایلهای تغییر یافته به همراه3 افزوده شده و 8 حذف شده
  1. 0 6
      lib/mapObjects/army/CCreatureSet.cpp
  2. 3 2
      lib/mapObjects/army/CCreatureSet.h

+ 0 - 6
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<int> fixedSize)

+ 3 - 2
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<std::string> 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)