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

Map objects now use shared_ptr (game)

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-13 19:42:18 +00:00
parent 2ca1748e96
commit 0ada2a5ebd
49 changed files with 487 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapping/ObstacleProxy.h
View File

@@ -41,13 +41,13 @@ public:
virtual std::pair<bool, bool> verifyCoverage(const int3 & t) const;
virtual void placeObject(rmg::Object & object, std::set<CGObjectInstance*> & instances);
virtual void placeObject(rmg::Object & object, std::set<std::shared_ptr<CGObjectInstance>> & instances);
virtual std::set<CGObjectInstance*> createObstacles(vstd::RNG & rand, IGameCallback * cb);
virtual std::set<std::shared_ptr<CGObjectInstance>> createObstacles(vstd::RNG & rand, IGameCallback * cb);
virtual bool isInTheMap(const int3& tile) = 0;
void finalInsertion(CMapEditManager * manager, std::set<CGObjectInstance*> & instances);
void finalInsertion(CMapEditManager * manager, std::set<std::shared_ptr<CGObjectInstance>> & instances);
virtual void postProcess(const rmg::Object& object) {};
@@ -70,7 +70,7 @@ public:
bool isInTheMap(const int3& tile) override;
std::set<CGObjectInstance*> placeObstacles(vstd::RNG& rand);
std::set<std::shared_ptr<CGObjectInstance>> placeObstacles(vstd::RNG& rand);
private:
CMap* map;