games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

vcmi: modernize lib/mapObjects

Browse Source
This commit is contained in:
Konstantin
2023-02-12 23:39:17 +03:00
parent b16f66477c
commit 5f181e25af
30 changed files with 647 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/mapObjects/CGTownInstance.h
View File

@@ -35,9 +35,8 @@ public:
class DLL_LINKAGE CCreGenAsCastleInfo : public virtual CSpecObjInfo
{
public:
CCreGenAsCastleInfo();
bool asCastle;
ui32 identifier;//h3m internal identifier
bool asCastle = false;
ui32 identifier = 0;//h3m internal identifier
std::vector<bool> allowedFactions;
@@ -48,8 +47,8 @@ public:
class DLL_LINKAGE CCreGenLeveledInfo : public virtual CSpecObjInfo
{
public:
CCreGenLeveledInfo();
ui8 minLevel, maxLevel; //minimal and maximal level of creature in dwelling: <1, 7>
ui8 minLevel = 0;
ui8 maxLevel = 7; //minimal and maximal level of creature in dwelling: <1, 7>
void serializeJson(JsonSerializeFormat & handler) override;
};
@@ -69,8 +68,7 @@ public:
CSpecObjInfo * info; //random dwelling options; not serialized
TCreaturesSet creatures; //creatures[level] -> <vector of alternative ids (base creature and upgrades, creatures amount>
CGDwelling();
virtual ~CGDwelling();
~CGDwelling() override;
void initRandomObjectInfo();
protected:
@@ -99,9 +97,8 @@ class DLL_LINKAGE CGTownBuilding : public IObjectInterface
{
///basic class for town structures handled as map objects
public:
si32 indexOnTV; //identifies its index on towns vector
CGTownInstance *town;
CGTownBuilding() : bType(BuildingSubID::NONE), indexOnTV(0), town(nullptr) {};
si32 indexOnTV = 0; //identifies its index on towns vector
CGTownInstance *town = nullptr;
STRONG_INLINE
BuildingSubID::EBuildingSubID getBuildingSubtype() const
@@ -137,10 +134,10 @@ public:
protected:
BuildingID bID; //from buildig list
BuildingSubID::EBuildingSubID bType;
BuildingSubID::EBuildingSubID bType = BuildingSubID::NONE;
const std::string getVisitingBonusGreeting() const;
const std::string getCustomBonusGreeting(const Bonus & bonus) const;
std::string getVisitingBonusGreeting() const;
std::string getCustomBonusGreeting(const Bonus & bonus) const;
};
class DLL_LINKAGE COPWBonus : public CGTownBuilding
@@ -150,8 +147,8 @@ public:
void setProperty(ui8 what, ui32 val) override;
void onHeroVisit (const CGHeroInstance * h) const override;
COPWBonus (BuildingID index, BuildingSubID::EBuildingSubID subId, CGTownInstance *TOWN);
COPWBonus () {};
COPWBonus(const BuildingID & index, BuildingSubID::EBuildingSubID subId, CGTownInstance * TOWN);
COPWBonus() = default;
template <typename Handler> void serialize(Handler &h, const int version)
{
@@ -169,8 +166,8 @@ public:
void setProperty(ui8 what, ui32 val) override;
void onHeroVisit (const CGHeroInstance * h) const override;
CTownBonus (BuildingID index, BuildingSubID::EBuildingSubID subId, CGTownInstance *TOWN);
CTownBonus () {};
CTownBonus(const BuildingID & index, BuildingSubID::EBuildingSubID subId, CGTownInstance * TOWN);
CTownBonus() = default;
template <typename Handler> void serialize(Handler &h, const int version)
{
@@ -195,8 +192,8 @@ struct DLL_LINKAGE GrowthInfo
int count;
std::string description;
Entry(const std::string &format, int _count);
Entry(int subID, BuildingID building, int _count);
Entry(int _count, const std::string &fullDescription);
Entry(int subID, const BuildingID & building, int _count);
Entry(int _count, std::string fullDescription);
};
std::vector<Entry> entries;
@@ -284,7 +281,7 @@ public:
const CArmedInstance *getUpperArmy() const; //garrisoned hero if present or the town itself
std::string getNameTranslated() const;
void setNameTranslated( std::string const & newName );
void setNameTranslated(const std::string & newName);
//////////////////////////////////////////////////////////////////////////
@@ -316,19 +313,19 @@ public:
//checks if special building with type buildingID is constructed
bool hasBuilt(BuildingSubID::EBuildingSubID buildingID) const;
//checks if building is constructed and town has same subID
bool hasBuilt(BuildingID buildingID) const;
bool hasBuilt(BuildingID buildingID, int townID) const;
bool hasBuilt(const BuildingID & buildingID) const;
bool hasBuilt(const BuildingID & buildingID, int townID) const;
TResources getBuildingCost(BuildingID buildingID) const;
TResources getBuildingCost(const BuildingID & buildingID) const;
TResources dailyIncome() const; //calculates daily income of this town
int spellsAtLevel(int level, bool checkGuild) const; //levels are counted from 1 (1 - 5)
bool armedGarrison() const; //true if town has creatures in garrison or garrisoned hero
int getTownLevel() const;
CBuilding::TRequired genBuildingRequirements(BuildingID build, bool deep = false) const;
CBuilding::TRequired genBuildingRequirements(const BuildingID & build, bool deep = false) const;
void mergeGarrisonOnSiege() const; // merge garrison into army of visiting hero
void removeCapitols (PlayerColor owner) const;
void removeCapitols(const PlayerColor & owner) const;
void clearArmy() const;
void addHeroToStructureVisitors(const CGHeroInstance *h, si64 structureInstanceID) const; //hero must be visiting or garrisoned in town
void deleteTownBonus(BuildingID::EBuildingID bid);
@@ -365,10 +362,10 @@ protected:
void serializeJsonOptions(JsonSerializeFormat & handler) override;
private:
void setOwner(const PlayerColor owner) const;
void onTownCaptured(const PlayerColor winner) const;
void setOwner(const PlayerColor & owner) const;
void onTownCaptured(const PlayerColor & winner) const;
int getDwellingBonus(const std::vector<CreatureID>& creatureIds, const std::vector<ConstTransitivePtr<CGDwelling> >& dwellings) const;
bool hasBuiltInOldWay(ETownType::ETownType type, BuildingID bid) const;
bool hasBuiltInOldWay(ETownType::ETownType type, const BuildingID & bid) const;
bool townEnvisagesBuilding(BuildingSubID::EBuildingSubID bid) const;
bool isBonusingBuildingAdded(BuildingID::EBuildingID bid) const;
void tryAddOnePerWeekBonus(BuildingSubID::EBuildingSubID subID);