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

Redone RMG template serialization using JSON serializer, added tests

Browse Source
This commit is contained in:
AlexVinS
2018-03-09 21:11:20 +03:00
parent 7d27d144a5
commit 9d108d59db
25 changed files with 991 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rmg/CMapGenerator.cpp
View File

@@ -149,6 +149,7 @@ std::unique_ptr<CMap> CMapGenerator::generate(CMapGenOptions * mapGenOptions, in
map->calculateGuardingGreaturePositions(); //clear map so that all tiles are unguarded
fillZones();
//updated guarded tiles will be calculated in CGameState::initMapObjects()
zones.clear();
}
catch (rmgException &e)
{
@@ -277,8 +278,8 @@ void CMapGenerator::genZones()
zones.clear();
for(const auto & option : tmpl->getZones())
{
auto zone = new CRmgTemplateZone();
zone->setOptions(option.second);
auto zone = std::make_shared<CRmgTemplateZone>();
zone->setOptions(option.second.get());
zones[zone->getId()] = zone;
//todo: move to CRmgTemplateZone constructor
zone->setGenPtr(this);//immediately set gen pointer before taking any actions on zones
@@ -317,7 +318,7 @@ void CMapGenerator::fillZones()
createConnections2(); //subterranean gates and monoliths
std::vector<CRmgTemplateZone*> treasureZones;
std::vector<std::shared_ptr<CRmgTemplateZone>> treasureZones;
for (auto it : zones)
{
it.second->fill();
@@ -716,7 +717,7 @@ void CMapGenerator::checkIsOnMap(const int3& tile) const
}
std::map<TRmgTemplateZoneId, CRmgTemplateZone*> CMapGenerator::getZones() const
CMapGenerator::Zones & CMapGenerator::getZones()
{
return zones;
}