games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge pull request #3083 from Nordsoft91/editor-improvements-1.4

Browse Source 
Redesign map editor rendering
This commit is contained in:
Ivan Savenko
2023-10-22 16:56:39 +03:00
committed by GitHub
parent a70ad7202f b9a660f6c3
commit a5f0429691
7 changed files with 151 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/mapping/ObstacleProxy.cpp
View File

@@ -208,10 +208,11 @@ bool EditorObstaclePlacer::isInTheMap(const int3& tile)
return map->isInTheMap(tile);
}
void EditorObstaclePlacer::placeObstacles(CRandomGenerator & rand)
std::set<CGObjectInstance*> EditorObstaclePlacer::placeObstacles(CRandomGenerator & rand)
{
auto obstacles = createObstacles(rand);
finalInsertion(map->getEditManager(), obstacles);
return obstacles;
}
VCMI_LIB_NAMESPACE_END

4
lib/mapping/ObstacleProxy.h
View File

@@ -67,10 +67,10 @@ public:
bool isInTheMap(const int3& tile) override;
void placeObstacles(CRandomGenerator& rand);
std::set<CGObjectInstance*> placeObstacles(CRandomGenerator& rand);
private:
CMap* map;
};
VCMI_LIB_NAMESPACE_END
VCMI_LIB_NAMESPACE_END