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

A variety of suggested style tweaks

Browse Source
This commit is contained in:
Tomasz Zieliński
2022-09-25 09:33:56 +02:00
parent fd63cb6109
commit 4ea57ea7fc
66 changed files with 155 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rmg/Functions.cpp
View File

@ -93,14 +93,14 @@ void createBorder(RmgMap & gen, Zone & zone)
}
}
void paintZoneTerrain(const Zone & zone, CRandomGenerator & generator, RmgMap & map, TTerrain terrain)
void paintZoneTerrain(const Zone & zone, CRandomGenerator & generator, RmgMap & map, TTerrainId terrain)
{
auto v = zone.getArea().getTilesVector();
map.getEditManager()->getTerrainSelection().setSelection(v);
map.getEditManager()->drawTerrain(terrain, &generator);
}
int chooseRandomAppearance(CRandomGenerator & generator, si32 ObjID, TTerrain terrain)
int chooseRandomAppearance(CRandomGenerator & generator, si32 ObjID, TTerrainId terrain)
{
auto factories = VLC->objtypeh->knownSubObjects(ObjID);
vstd::erase_if(factories, [ObjID, &terrain](si32 f)
@ -116,7 +116,7 @@ void initTerrainType(Zone & zone, CMapGenerator & gen)
if(zone.getType()==ETemplateZoneType::WATER)
{
//collect all water terrain types
std::vector<TTerrain> waterTerrains;
std::vector<TTerrainId> waterTerrains;
for(auto & terrain : VLC->terrainTypeHandler->terrains())
if(terrain->isWater())
waterTerrains.push_back(terrain->id);