games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

[RMG] Fix mingw build, fix some warnings

Browse Source
This commit is contained in:
AlexVinS
2014-07-26 10:12:45 +04:00
parent 8f946e4add
commit b654ea831b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rmg/CMapGenerator.cpp
View File

@@ -470,7 +470,7 @@ int CMapGenerator::getPrisonsRemaning() const
} }
void CMapGenerator::decreasePrisonsRemaining() void CMapGenerator::decreasePrisonsRemaining()
{ {
prisonsRemaining = std::max (0, prisonsRemaining--); prisonsRemaining = std::max (0, prisonsRemaining - 1);
} }
void CMapGenerator::registerZone (TFaction faction) void CMapGenerator::registerZone (TFaction faction)

6
lib/rmg/CRmgTemplateZone.cpp
View File

@@ -1159,7 +1159,7 @@ void CRmgTemplateZone::createObstacles(CMapGenerator* gen)
{ {
possibleObstacles.push_back (std::make_pair(o.first, o.second)); possibleObstacles.push_back (std::make_pair(o.first, o.second));
} }
boost::sort (possibleObstacles, [](obstaclePair &p1, obstaclePair &p2) -> bool boost::sort (possibleObstacles, [](const obstaclePair &p1, const obstaclePair &p2) -> bool
{ {
return p1.first > p2.first; //bigger obstacles first return p1.first > p2.first; //bigger obstacles first
}); });
@@ -1184,7 +1184,7 @@ void CRmgTemplateZone::createObstacles(CMapGenerator* gen)
for (auto tile : boost::adaptors::reverse(tileinfo)) for (auto tile : boost::adaptors::reverse(tileinfo))
{ {
//fill tiles that should be blocked with obstacles or are just possible (with some probability) //fill tiles that should be blocked with obstacles or are just possible (with some probability)
if (gen->shouldBeBlocked(tile) || gen->isPossible(tile) && gen->rand.nextInt(1,100) < 60) if (gen->shouldBeBlocked(tile) || (gen->isPossible(tile) && gen->rand.nextInt(1,100) < 60))
{ {
//start from biggets obstacles //start from biggets obstacles
for (int i = 0; i < possibleObstacles.size(); i++) for (int i = 0; i < possibleObstacles.size(); i++)
@@ -1967,4 +1967,4 @@ void CRmgTemplateZone::addAllPossibleObjects (CMapGenerator* gen)
void ObjectInfo::setTemplate (si32 type, si32 subtype, ETerrainType terrainType) void ObjectInfo::setTemplate (si32 type, si32 subtype, ETerrainType terrainType)
{ {
templ = VLC->objtypeh->getHandlerFor(type, subtype)->getTemplates(terrainType).front(); templ = VLC->objtypeh->getHandlerFor(type, subtype)->getTemplates(terrainType).front();
} }