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

Merge remote-tracking branch 'origin/develop' into reward_select_all

Browse Source 
# Conflicts:
#	lib/mapObjects/CRewardableObject.cpp
This commit is contained in:
Tomasz Zieliński
2024-03-09 06:50:56 +01:00
parent 9d705a3961 bea80a60fb
commit fe8bcc5758
1169 changed files with 48107 additions and 28680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CRewardableObject.h
View File

@@ -67,9 +67,9 @@ public:
void initObj(CRandomGenerator & rand) override;
void setPropertyDer(ui8 what, ui32 val) override;
void setPropertyDer(ObjProperty what, ObjPropertyID identifier) override;
CRewardableObject();
CRewardableObject(IGameCallback *cb);
std::string getHoverText(PlayerColor player) const override;
std::string getHoverText(const CGHeroInstance * hero) const override;
@@ -80,7 +80,7 @@ public:
std::vector<Component> getPopupComponents(PlayerColor player) const override;
std::vector<Component> getPopupComponents(const CGHeroInstance * hero) const override;
template <typename Handler> void serialize(Handler &h, const int version)
template <typename Handler> void serialize(Handler &h)
{
h & static_cast<CArmedInstance&>(*this);
h & static_cast<Rewardable::Interface&>(*this);