games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Removed most of non-const static fields in lib. Reduced header includes.

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-09 16:43:36 +02:00
parent a15366f5a5
commit e67e4430ba
49 changed files with 139 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapping/CMapOperation.cpp
View File

@@ -12,7 +12,9 @@
#include "CMapOperation.h"
#include "../VCMI_Lib.h"
#include "../CRandomGenerator.h"
#include "../TerrainHandler.h"
#include "../mapObjects/CGObjectInstance.h"
#include "CMap.h"
#include "MapEditUtils.h"
@@ -510,9 +512,8 @@ CDrawTerrainOperation::InvalidTiles CDrawTerrainOperation::getInvalidTiles(const
{
if(map->isInTheMap(pos))
{
const auto & ptrConfig = VLC->terviewh;
const auto * terType = map->getTile(pos).terType;
auto valid = validateTerrainView(pos, ptrConfig->getTerrainTypePatternById("n1")).result;
auto valid = validateTerrainView(pos, VLC->terviewh->getTerrainTypePatternById("n1")).result;
// Special validity check for rock & water
if(valid && (terType->isWater() || !terType->isPassable()))
@@ -520,7 +521,7 @@ CDrawTerrainOperation::InvalidTiles CDrawTerrainOperation::getInvalidTiles(const
static const std::string patternIds[] = { "s1", "s2" };
for(const auto & patternId : patternIds)
{
valid = !validateTerrainView(pos, ptrConfig->getTerrainTypePatternById(patternId)).result;
valid = !validateTerrainView(pos, VLC->terviewh->getTerrainTypePatternById(patternId)).result;
if(!valid) break;
}
}
@@ -530,7 +531,7 @@ CDrawTerrainOperation::InvalidTiles CDrawTerrainOperation::getInvalidTiles(const
static const std::string patternIds[] = { "n2", "n3" };
for(const auto & patternId : patternIds)
{
valid = validateTerrainView(pos, ptrConfig->getTerrainTypePatternById(patternId)).result;
valid = validateTerrainView(pos, VLC->terviewh->getTerrainTypePatternById(patternId)).result;
if(valid) break;
}
}