games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Quests in map now use shared_ptr instead of const ptr

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-09 22:44:36 +00:00
parent 417ea6451a
commit 797646cc05
20 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapping/CMap.h
View File

@@ -59,7 +59,11 @@ struct DLL_LINKAGE Rumor
/// The map contains the map header, the tiles of the terrain, objects, heroes, towns, rumors...
class DLL_LINKAGE CMap : public CMapHeader, public GameCallbackHolder
{
friend class CSerializer;
std::unique_ptr<GameSettings> gameSettings;
std::vector< std::shared_ptr<CQuest> > quests;
public:
explicit CMap(IGameCallback *cb);
~CMap();
@@ -86,8 +90,9 @@ public:
void putArtifactInstance(CArtifactSet & set, CArtifactInstance * art, const ArtifactPosition & slot);
void removeArtifactInstance(CArtifactSet & set, const ArtifactPosition & slot);
void addNewQuestInstance(CQuest * quest);
void removeQuestInstance(CQuest * quest);
void addNewQuestInstance(std::shared_ptr<CQuest> quest);
void removeQuestInstance(std::shared_ptr<CQuest> quest);
void clearQuestInstance(const CQuest * quest);
void setUniqueInstanceName(CGObjectInstance * obj);
///Use only this method when creating new map object instances
@@ -130,7 +135,6 @@ public:
std::vector< ConstTransitivePtr<CGObjectInstance> > objects;
std::vector< ConstTransitivePtr<CGTownInstance> > towns;
std::vector< ConstTransitivePtr<CArtifactInstance> > artInstances;
std::vector< ConstTransitivePtr<CQuest> > quests;
std::vector< ConstTransitivePtr<CGHeroInstance> > allHeroes; //indexed by [hero_type_id]; on map, disposed, prisons, etc.
//Helper lists