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

Use ArtifactInstanceID in CGArtifact

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-18 20:38:12 +00:00
parent ab11d2b075
commit 16a06179cf
11 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/MiscObjects.h
View File

@@ -90,10 +90,10 @@ protected:
class DLL_LINKAGE CGArtifact : public CArmedInstance
{
ArtifactInstanceID storedArtifact;
public:
using CArmedInstance::CArmedInstance;
CArtifactInstance * storedArtifact = nullptr;
MetaString message;
void onHeroVisit(const CGHeroInstance * h) const override;
@@ -111,7 +111,9 @@ public:
BattleField getBattlefield() const override;
ArtifactID getArtifact() const;
ArtifactID getArtifactType() const;
const CArtifactInstance * getArtifactInstance() const;
void setArtifactInstance(const CArtifactInstance *);
template <typename Handler> void serialize(Handler &h)
{