2
0
Эх сурвалжийг харах

revert Nullkiller to develop code

Mircea TheHonestCTO 4 сар өмнө
parent
commit
004e514fbc

+ 3 - 2
AI/Nullkiller/AIGateway.cpp

@@ -603,7 +603,7 @@ void AIGateway::yourTurn(QueryID queryID)
 
 
 	asyncTasks->run([this]()
 	asyncTasks->run([this]()
 	{
 	{
-		ScopedThreadName guard("NKAI::AIGateway::makingTurn");
+		ScopedThreadName guard("NKAI::makingTurn");
 		makeTurn();
 		makeTurn();
 	});
 	});
 }
 }
@@ -845,6 +845,7 @@ bool AIGateway::makePossibleUpgrades(const CArmedInstance * obj)
 
 
 void AIGateway::makeTurn()
 void AIGateway::makeTurn()
 {
 {
+	setThreadName("AIGateway::makeTurn");
 	MAKING_TURN;
 	MAKING_TURN;
 
 
 	auto day = cb->getDate(Date::DAY);
 	auto day = cb->getDate(Date::DAY);
@@ -1627,7 +1628,7 @@ void AIGateway::executeActionAsync(const std::string & description, const std::f
 
 
 	asyncTasks->run([this, description, whatToDo]()
 	asyncTasks->run([this, description, whatToDo]()
 	{
 	{
-		ScopedThreadName guard("NKAI::AIGateway::" + description);
+		ScopedThreadName guard("NKAI::" + description);
 		SET_GLOBAL_STATE(this);
 		SET_GLOBAL_STATE(this);
 		std::shared_lock gsLock(CGameState::mutex);
 		std::shared_lock gsLock(CGameState::mutex);
 		whatToDo();
 		whatToDo();

+ 1 - 1
AI/Nullkiller/Pathfinding/AINodeStorage.h

@@ -12,7 +12,7 @@
 
 
 #define NKAI_PATHFINDER_TRACE_LEVEL 0
 #define NKAI_PATHFINDER_TRACE_LEVEL 0
 constexpr int NKAI_GRAPH_TRACE_LEVEL = 0; // To actually enable graph visualization, enter `/vslog graph` in game chat
 constexpr int NKAI_GRAPH_TRACE_LEVEL = 0; // To actually enable graph visualization, enter `/vslog graph` in game chat
-#define NKAI_TRACE_LEVEL 2
+#define NKAI_TRACE_LEVEL 0
 
 
 #include "../../../lib/pathfinder/CGPathNode.h"
 #include "../../../lib/pathfinder/CGPathNode.h"
 #include "../../../lib/pathfinder/INodeStorage.h"
 #include "../../../lib/pathfinder/INodeStorage.h"