games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Ivan Savenko
2025-07-07 19:50:52 +03:00
parent 33431adb27
commit 4c2d67eb45
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/army/CCreatureSet.cpp
View File

@@ -637,12 +637,6 @@ bool CCreatureSet::hasStackAtSlot(const SlotID & slot) const
return vstd::contains(stacks, slot); return vstd::contains(stacks, slot);
} }
CCreatureSet & CCreatureSet::operator=(const CCreatureSet & cs)
{
assert(0);
return *this;
}
void CCreatureSet::armyChanged() {} void CCreatureSet::armyChanged() {}
void CCreatureSet::serializeJson(JsonSerializeFormat & handler, const std::string & armyFieldName, const std::optional<int> fixedSize) void CCreatureSet::serializeJson(JsonSerializeFormat & handler, const std::string & armyFieldName, const std::optional<int> fixedSize)

5
lib/mapObjects/army/CCreatureSet.h
View File

@@ -10,6 +10,7 @@
#pragma once #pragma once
#include "CSimpleArmy.h" #include "CSimpleArmy.h"
#include "CStackInstance.h"
#include "serializer/Serializeable.h" #include "serializer/Serializeable.h"
@@ -37,10 +38,10 @@ namespace NArmyFormation
static const std::vector<std::string> names{"wide", "tight"}; 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(const CCreatureSet &) = delete;
CCreatureSet & operator=(const CCreatureSet &); CCreatureSet & operator=(const CCreatureSet &) = delete;
public: public:
TSlots stacks; //slots[slot_id]->> pair(creature_id,creature_quantity) TSlots stacks; //slots[slot_id]->> pair(creature_id,creature_quantity)