Преглед на файлове

Code style: avoid some ambiguous else if indentation

If some code intentionally want to break else if to achieve specific indentation there must be braces.
Arseniy Shestakov преди 8 години
родител
ревизия
cdd9dbc7f1
променени са 2 файла, в които са добавени 6 реда и са изтрити 0 реда
  1. 4 0
      AI/VCAI/Goals.cpp
  2. 2 0
      lib/rmg/CZonePlacer.cpp

+ 4 - 0
AI/VCAI/Goals.cpp

@@ -1006,13 +1006,17 @@ TGoalVec Conquer::getAllPossibleSubgoals()
 						else
 						{
 							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)));
+							}
 							else //just visit that tile
+							{
 								if(obj->ID.num == Obj::TOWN)
 									//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
 								else
 									ret.push_back(sptr(Goals::VisitTile(dest).sethero(h).setisAbstract(true)));
+							}
 						}
 					}
 					else //we need to get army in order to conquer that place

+ 2 - 0
lib/rmg/CZonePlacer.cpp

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