Browse Source

Review fixes

Ivan Savenko 1 year ago
parent
commit
431b2865a4

+ 2 - 2
AI/Nullkiller/Analyzers/ObjectClusterizer.h

@@ -17,8 +17,8 @@ namespace NKAI
 
 
 struct ClusterObjectInfo
 struct ClusterObjectInfo
 {
 {
-	float priority = 0;
-	float movementCost = 0;
+	float priority = 0.f;
+	float movementCost = 0.f;
 	uint64_t danger = 0;
 	uint64_t danger = 0;
 	uint8_t turn = 0;
 	uint8_t turn = 0;
 };
 };

+ 5 - 1
AI/Nullkiller/Pathfinding/AINodeStorage.cpp

@@ -1203,7 +1203,10 @@ void AINodeStorage::calculateTownPortalTeleportations(std::vector<CGPathNode *>
 	std::vector<const ChainActor *> actorsVector(actorsOfInitial.begin(), actorsOfInitial.end());
 	std::vector<const ChainActor *> actorsVector(actorsOfInitial.begin(), actorsOfInitial.end());
 	tbb::concurrent_vector<CGPathNode *> output;
 	tbb::concurrent_vector<CGPathNode *> output;
 
 
-	if(false) //if (actorsVector.size() * initialNodes.size() > 1000)
+// TODO: re-enable after fixing thread races. See issue for details:
+// https://github.com/vcmi/vcmi/pull/4130
+#if 0
+	if (actorsVector.size() * initialNodes.size() > 1000)
 	{
 	{
 		tbb::parallel_for(tbb::blocked_range<size_t>(0, actorsVector.size()), [&](const tbb::blocked_range<size_t> & r)
 		tbb::parallel_for(tbb::blocked_range<size_t>(0, actorsVector.size()), [&](const tbb::blocked_range<size_t> & r)
 			{
 			{
@@ -1216,6 +1219,7 @@ void AINodeStorage::calculateTownPortalTeleportations(std::vector<CGPathNode *>
 		std::copy(output.begin(), output.end(), std::back_inserter(initialNodes));
 		std::copy(output.begin(), output.end(), std::back_inserter(initialNodes));
 	}
 	}
 	else
 	else
+#endif
 	{
 	{
 		for(auto actor : actorsVector)
 		for(auto actor : actorsVector)
 		{
 		{