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

Merge remote-tracking branch 'vcmi/beta' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-08 18:49:06 +03:00
parent 24ad06b5c3 7aef40dfb6
commit e8453916cf
54 changed files with 320 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/mapObjects/MiscObjects.h
View File

@@ -196,6 +196,8 @@ public:
GameResID producedResource;
ui32 producedQuantity;
std::set<GameResID> abandonedMineResources;
bool isAbandoned() const;
private:
void onHeroVisit(const CGHeroInstance * h) const override;
@@ -209,7 +211,6 @@ private:
std::string getObjectName() const override;
std::string getHoverText(PlayerColor player) const override;
bool isAbandoned() const;
public:
template <typename Handler> void serialize(Handler &h, const int version)
{