소스 검색

[programming challenge] More fixes for paths. Logging AI name with PID in server logs.

Michał W. Urbańczyk 14 년 전
부모
커밋
67571d5823
3개의 변경된 파일3개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 2
      VCMI_VS10.sln
  2. 2 2
      lib/CGameInterface.cpp
  3. 1 1
      server/CVCMIServer.cpp

+ 0 - 2
VCMI_VS10.sln

@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Odpalarka", "Odpalarka\Odpa
 		{B952FFC5-3039-4DE1-9F08-90ACDA483D8F} = {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C710950-7839-490C-8412-C60AC4D5238B}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VCMI_client", "client\VCMI_client.vcxproj", "{8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MadAI", "AI\MadAI\MadAI.vcxproj", "{DF931F3D-6DD2-4D1F-ADE9-F0098B5AE3F0}"

+ 2 - 2
lib/CGameInterface.cpp

@@ -76,8 +76,8 @@ template<typename rett>
 rett * createAnyAI(std::string dllname, std::string methodName)
 {
 	tlog1 << "Opening " << dllname<<"\n";
-
-	if(vstd::contains(dllname, '/'))
+	
+	if(vstd::contains(dllname, '/') || vstd::contains(dllname, '\\'))
 	{
 		tlog1 << "Assuming that AI is an absolute path.\n";
 	}

+ 1 - 1
server/CVCMIServer.cpp

@@ -625,7 +625,7 @@ void CVCMIServer::startDuel(const std::string &battle, const std::string &leftAI
 		{
 			if(aisSoFar < 2)
 			{
-				tlog0 << " (PID=" << pidsFromConns[c] << ") will run " << (aisSoFar ? "right" : "left") << " AI " << std::endl;
+				tlog0 << " (PID=" << pidsFromConns[c] << ") will run " << (aisSoFar ? "right" : "left") << " AI: " << gh->ais[aisSoFar] << std::endl;
 				*c << gh->ais[aisSoFar] << ui8(aisSoFar);
 				PIDs[aisSoFar] = pidsFromConns[c];
 				aisSoFar++;