EditBoard: restructure loop for consistency.

[gnushogi.git] / gnushogi / rawdsp.c

diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c
index b0e4084..287e578 100644 (file)
--- a/gnushogi/rawdsp.c
+++ b/gnushogi/rawdsp.c
@@ -349,11 +349,14 @@ Raw_EditBoard(void)
 
     a = black;
 
-    do
+    while(1)
     {
         scanf("%s", s);
         found = 0;
 
+        if (s[0] == '.')
+            break;
+
         if (s[0] == '#')
         {
             for (sq = 0; sq < NO_SQUARES; sq++)
@@ -385,8 +388,8 @@ Raw_EditBoard(void)
         }
         else
         {
-            c = COL_NAME(s[1]);
-            r = ROW_NAME(s[2]);
+            c = COL_NUM(s[1]);
+            r = ROW_NUM(s[2]);
         }
 
         if ((c >= 0) && (c < NO_COLS) && (r >= 0) && (r < NO_ROWS))
@@ -413,7 +416,6 @@ Raw_EditBoard(void)
                 color[sq] = neutral;
         }
     }
-    while (s[0] != '.');
 
     for (sq = 0; sq < NO_SQUARES; sq++)
         Mvboard[sq] = ((board[sq] != Stboard[sq]) ? 10 : 0);