games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Code style: avoid some ambiguous else if indentation

Browse Source 
If some code intentionally want to break else if to achieve specific indentation there must be braces.
This commit is contained in:
Arseniy Shestakov 2017-07-19 03:42:26 +03:00
parent 6d9f99d4de
commit cdd9dbc7f1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AI/VCAI/Goals.cpp
View File

@ -1006,13 +1006,17 @@ TGoalVec Conquer::getAllPossibleSubgoals()
else else
{ {
if(obj->ID.num == Obj::HERO) //enemy hero may move to other position if(obj->ID.num == Obj::HERO) //enemy hero may move to other position
{
ret.push_back(sptr(Goals::VisitHero(obj->id.getNum()).sethero(h).setisAbstract(true))); ret.push_back(sptr(Goals::VisitHero(obj->id.getNum()).sethero(h).setisAbstract(true)));
}
else //just visit that tile else //just visit that tile
{
if(obj->ID.num == Obj::TOWN) if(obj->ID.num == Obj::TOWN)
//if target is town, fuzzy system will use additional "estimatedReward" variable to increase priority a bit //if target is town, fuzzy system will use additional "estimatedReward" variable to increase priority a bit
ret.push_back(sptr(Goals::VisitTile(dest).sethero(h).setobjid(obj->ID.num).setisAbstract(true))); //TODO: change to getObj eventually and and move appropiate logic there ret.push_back(sptr(Goals::VisitTile(dest).sethero(h).setobjid(obj->ID.num).setisAbstract(true))); //TODO: change to getObj eventually and and move appropiate logic there
else else
ret.push_back(sptr(Goals::VisitTile(dest).sethero(h).setisAbstract(true))); ret.push_back(sptr(Goals::VisitTile(dest).sethero(h).setisAbstract(true)));
}
} }
} }
else //we need to get army in order to conquer that place else //we need to get army in order to conquer that place

2
lib/rmg/CZonePlacer.cpp
View File

@ -129,8 +129,10 @@ void CZonePlacer::placeZones(const CMapGenOptions * mapGenOptions, CRandomGenera
improvement = true; improvement = true;
} }
else else
{
if (totalDistance + totalOverlap < bestTotalDistance + bestTotalOverlap) if (totalDistance + totalOverlap < bestTotalDistance + bestTotalOverlap)
improvement = true; improvement = true;
}
logGlobal->traceStream() << boost::format("Total distance between zones after this iteration: %2.4f, Total overlap: %2.4f, Improved: %s") % totalDistance % totalOverlap % improvement; logGlobal->traceStream() << boost::format("Total distance between zones after this iteration: %2.4f, Total overlap: %2.4f, Improved: %s") % totalDistance % totalOverlap % improvement;