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

Unified income handling, added IOwnableObject interface

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-24 20:42:19 +00:00
parent 189cb1c762
commit 0fd9dbf240
20 changed files with 116 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapObjects/MiscObjects.h
View File

@@ -10,6 +10,7 @@
#pragma once
#include "CArmedInstance.h"
#include "IOwnableObject.h"
#include "../texts/MetaString.h"
VCMI_LIB_NAMESPACE_BEGIN
@@ -148,16 +149,13 @@ protected:
void serializeJsonOptions(JsonSerializeFormat & handler) override;
};
class DLL_LINKAGE CGMine : public CArmedInstance
class DLL_LINKAGE CGMine : public CArmedInstance, public IOwnableObject
{
public:
GameResID producedResource;
ui32 producedQuantity;
std::set<GameResID> abandonedMineResources;
bool isAbandoned() const;
ResourceSet dailyIncome() const;
private:
using CArmedInstance::CArmedInstance;
@@ -166,7 +164,6 @@ private:
void blockingDialogAnswered(const CGHeroInstance *hero, int32_t answer) const override;
void flagMine(const PlayerColor & player) const;
void newTurn(vstd::RNG & rand) const override;
void initObj(vstd::RNG & rand) override;
std::string getObjectName() const override;
@@ -183,6 +180,9 @@ public:
ui32 defaultResProduction() const;
ui32 getProducedQuantity() const;
ResourceSet dailyIncome() const override;
const IOwnableObject * asOwnable() const final;
protected:
void serializeJsonOptions(JsonSerializeFormat & handler) override;
};