X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fjaws.c;h=99f41b120c19509586cc7b6e51e98b3bed301e72;hb=e09a0eec4ba28e134a7599d61cb9ee091e7cebf9;hp=9d8ec9c9269541312662bacb0f314f6f315e23b1;hpb=08b791a1526fb669916eec752752f1cbb0582de1;p=xboard.git

diff --git a/winboard/jaws.c b/winboard/jaws.c
index 9d8ec9c..99f41b1 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -83,16 +83,6 @@
 
 extern long whiteTimeRemaining, blackTimeRemaining, timeControl, timeIncrement;
 
-#if 0
-// from moves.h, but no longer needed, as the new routines are all moved to winboard.c
-
-extern char* PieceToName P((ChessSquare p, int i));
-extern char* SquareToChar P((int Xpos)); 
-extern char* SquareToNum P((int Ypos));
-extern int CoordToNum P((char c));
-
-#endif
-
 // from moves.c, added WinBoard_F piece types and ranks / files
 
 char *squareToChar[] = { "ay", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l" };
@@ -239,7 +229,6 @@ AdaptMenu()
 
 	helpMenuInfo.cbSize = sizeof(helpMenuInfo);
 	menuMain = GetMenu(hwndMain);
-	if(appData.debugMode) fprintf(debugFP, "hwndMain: %8x %8x\n", hwndMain, menuMain);
 	menuJAWS = CreatePopupMenu();
 	
 	for(i=0; menuItemJAWS[i].name; i++) {
@@ -1133,9 +1122,10 @@ KeyboardMove(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				(BlackPawn <= pdown && pdown <= BlackKing &&
 				 BlackPawn <= pup && pup <= BlackKing))) {
 			/* EditPosition, empty square, or different color piece;
-			click-click move is possible */
+			click-click move is possible */		
+			char promoChoice = NULLCHAR;
 		
-			if (IsPromotion(oldFromX, oldFromY, fromX, fromY)) {
+			if (HasPromotionChoice(oldFromX, oldFromY, fromX, fromY, &promoChoice)) {
 				if (appData.alwaysPromoteToQueen) {
 					UserMoveEvent(oldFromX, oldFromY, fromX, fromY, 'q');
 				}
@@ -1146,7 +1136,7 @@ KeyboardMove(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 				}	
 			}
 			else {
-				UserMoveEvent(oldFromX, oldFromY, fromX, fromY, NULLCHAR);
+				UserMoveEvent(oldFromX, oldFromY, fromX, fromY, promoChoice);
 			}
 		oldFromX = oldFromY = -1;
 		break;