Convert xboard.cpp

shinkarom · Jan 3, 2021 · e796f7a · e796f7a
1 parent 61bbb09
commit e796f7a
Show file tree

Hide file tree

Showing 5 changed files with 413 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ delimiter-test-*
 *.o
 *.obj
 *.lst
+/bin/log.txt
diff --git a/source/alloctime.d b/source/alloctime.d
@@ -14,15 +14,15 @@ double allocatetime()
 	{
 		return 128000000;
 	}
-	if(searchparam.movestogo > 0)
+	if(searchparam.movestogo[p.side] > 0)
 	{
 		if(p.side==black)
 		{
-			return ((searchparam.btime + (searchparam.binc*searchparam.movestogo)) / searchparam.movestogo+1)-1000;
+			return ((searchparam.btime + (searchparam.binc*searchparam.movestogo[p.side])) / searchparam.movestogo[p.side]+1)-1000;
 		}
 		else
 		{
-			return ((searchparam.wtime + (searchparam.winc*searchparam.movestogo)) / searchparam.movestogo+1)-1000;			
+			return ((searchparam.wtime + (searchparam.winc*searchparam.movestogo[p.side])) / searchparam.movestogo[p.side]+1)-1000;			
 		}
 	}
 	else
@@ -48,15 +48,15 @@ double pondertime()
 	{
 		return 128000000;
 	}
-	if(searchparam.movestogo > 0)
+	if(searchparam.movestogo[p.side] > 0)
 	{
 		if(p.side==black)
 		{
-			return ((searchparam.btime + (searchparam.binc*searchparam.movestogo)) / searchparam.movestogo+1)-1000;
+			return ((searchparam.btime + (searchparam.binc*searchparam.movestogo[p.side])) / searchparam.movestogo[p.side]+1)-1000;
 		}
 		else
 		{
-			return ((searchparam.wtime + (searchparam.winc*searchparam.movestogo)) / searchparam.movestogo+1)-1000;			
+			return ((searchparam.wtime + (searchparam.winc*searchparam.movestogo[p.side])) / searchparam.movestogo[p.side]+1)-1000;			
 		}
 	}
 	else

diff --git a/source/defines.d b/source/defines.d
@@ -131,7 +131,7 @@ struct SearchParam
 	double xtime;
 	double xotime;
 	int inf;
-	double movestogo;
+	double[2] movestogo;
 	double timepermove;
 	double starttime;
 	double stoptime;

diff --git a/source/main.d b/source/main.d
@@ -35,9 +35,7 @@ void main()
 		}
 		else if (command=="xboard")
 		{
-			/+
-			xboard();
-			+/
+			xboard_mode();
 			break;
 		}
 		else if(command=="quit")