games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Fix formatting

Browse Source
This commit is contained in:
Vadim Markovtsev
2016-10-29 17:00:12 +02:00
parent 24793e115c
commit 9f967b4d7a
7 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CArtHandler.cpp
View File

@ -1348,11 +1348,6 @@ si32 CArtifactSet::getArtTypeId(ArtifactPosition pos) const
return a->artType->id; return a->artType->id;
} }
CArtifactSet::~CArtifactSet()
{
}
ArtSlotInfo & CArtifactSet::retreiveNewArtSlot(ArtifactPosition slot) ArtSlotInfo & CArtifactSet::retreiveNewArtSlot(ArtifactPosition slot)
{ {
assert(!vstd::contains(artifactsWorn, slot)); assert(!vstd::contains(artifactsWorn, slot));

2
lib/CArtHandler.h
View File

@ -324,7 +324,7 @@ public:
si32 getArtTypeId(ArtifactPosition pos) const; si32 getArtTypeId(ArtifactPosition pos) const;
virtual ArtBearer::ArtBearer bearerType() const = 0; virtual ArtBearer::ArtBearer bearerType() const = 0;
virtual ~CArtifactSet(); virtual ~CArtifactSet() = default;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {

5
lib/CCreatureSet.h
View File

@ -30,6 +30,7 @@ public:
CStackBasicDescriptor(); CStackBasicDescriptor();
CStackBasicDescriptor(CreatureID id, TQuantity Count); CStackBasicDescriptor(CreatureID id, TQuantity Count);
CStackBasicDescriptor(const CCreature *c, TQuantity Count); CStackBasicDescriptor(const CCreature *c, TQuantity Count);
virtual ~CStackBasicDescriptor() = default;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
@ -84,7 +85,7 @@ public:
CStackInstance(); CStackInstance();
CStackInstance(CreatureID id, TQuantity count); CStackInstance(CreatureID id, TQuantity count);
CStackInstance(const CCreature *cre, TQuantity count); CStackInstance(const CCreature *cre, TQuantity count);
~CStackInstance(); virtual ~CStackInstance();
void setType(CreatureID creID); void setType(CreatureID creID);
void setType(const CCreature *c); void setType(const CCreature *c);
@ -111,7 +112,7 @@ public:
void init() override; void init() override;
CCommanderInstance(); CCommanderInstance();
CCommanderInstance (CreatureID id); CCommanderInstance (CreatureID id);
~CCommanderInstance(); virtual ~CCommanderInstance();
void setAlive (bool alive); void setAlive (bool alive);
void giveStackExp (TExpType exp) override; void giveStackExp (TExpType exp) override;
void levelUp (); void levelUp ();

5
lib/CGeneralTextHandler.h
View File

@ -140,6 +140,9 @@ public:
std::vector<std::string> campaignMapNames; std::vector<std::string> campaignMapNames;
std::vector<std::vector<std::string>> campaignRegionNames; std::vector<std::vector<std::string>> campaignRegionNames;
void readToVector(std::string sourceName, std::vector<std::string> & dest); static void readToVector(std::string sourceName, std::vector<std::string> &dest);
CGeneralTextHandler(); CGeneralTextHandler();
CGeneralTextHandler(const CGeneralTextHandler&) = delete;
CGeneralTextHandler operator=(const CGeneralTextHandler&) = delete;
}; };