1 files changed, 24 insertions, 12 deletions

diff --git a/noncore/games/kcheckers/rcheckers.cpp b/noncore/games/kcheckers/rcheckers.cpp
index a1c7afa..d808780 100644
--- a/noncore/games/kcheckers/rcheckers.cpp
+++ b/noncore/games/kcheckers/rcheckers.cpp
@@ -67,117 +67,123 @@ bool RCheckers::go1(int from,int field)
             board[from]=FREE;
             board[to]=KING1;
             return true;
           }
           else if(board[i]==FREE) continue;
           else break;
         }
         for(int i=from+5;;i+=5)
         {
           if(i==to)
           {
             board[from]=FREE;
             board[to]=KING1;
             return true;
           }
           else if(board[i]==FREE) continue;
           else break;
         }
         for(int i=from+6;;i+=6)
         {
           if(i==to)
           {
             board[from]=FREE;
             board[to]=KING1;
             return true;
           }
           else if(board[i]==FREE) continue;
           else break;
         }
         return false;
     }
   }
   return false;
 }
 
 
 bool RCheckers::checkCapture1()
 {
   for(int i=6;i<48;i++)
   {
     switch(board[i])
     {
       case MAN1:
         if(board[i-6]==MAN2 || board[i-6]==KING2)
           if(board[i-12]==FREE) return true;
         if(board[i-5]==MAN2 || board[i-5]==KING2)
           if(board[i-10]==FREE) return true;
         if(board[i+5]==MAN2 || board[i+5]==KING2)
-          if(board[i+10]==FREE) return true;
+          if(board[((i+10) < 54) ? i+10 : 53]==FREE) return true;
         if(board[i+6]==MAN2 || board[i+6]==KING2)
-          if(board[i+12]==FREE) return true;
+          if(board[((i+12) < 54) ? i+12 : 53]==FREE) return true;
         break;
       case KING1:
         int k;
         for(k=i-6;board[k]==FREE;k-=6);
         if(board[k]==MAN2 || board[k]==KING2)
           if(board[k-6]==FREE) return true;
 
         for(k=i-5;board[k]==FREE;k-=5);
         if(board[k]==MAN2 || board[k]==KING2)
           if(board[k-5]==FREE) return true;
 
-        for(k=i+5;board[k]==FREE;k+=5);
+        for(k=i+5;board[k]==FREE;k+=5) {
+          if (k >= 49)
+            break;
+        }
         if(board[k]==MAN2 || board[k]==KING2)
-          if(board[k+5]==FREE) return true;
+          if(board[((k+5) < 54) ? k+5 : 53]==FREE) return true;
 
-        for(k=i+6;board[k]==FREE;k+=6);
+        for(k=i+6;board[k]==FREE;k+=6) {
+          if (k >=48)
+            break;
+        }
         if(board[k]==MAN2 || board[k]==KING2)
-          if(board[k+6]==FREE) return true;
+          if(board[((k+6) < 54) ? k+6 : 53]==FREE) return true;
     }
   }
   return false;
 }
 
 
 // Return TRUE if a course of the user true
 // Return FALSE if a course of the user incorrect
 
 bool RCheckers::manCapture1(int from,int direction,bool &capture)
 {
   int i=from+direction;
   if(board[i]==MAN2 || board[i]==KING2)
   {
     int k=i+direction;
     if(board[k]==FREE)
     {
       bool next=false;
       int save=board[i];
       board[from]=FREE;
       board[i]=NONE;
 
       if(k<10)
       {
         board[k]=KING1;
         if(kingCapture1(k,direction+11,next)) {board[i]=FREE;return true;}
       }
       else
       {
         board[k]=MAN1;
         if(direction==UL || direction==DR)
         {
           if(manCapture1(k,UR,next)) {board[i]=FREE;return true;}
           if(manCapture1(k,DL,next)) {board[i]=FREE;return true;}
         }
         else
         {
           if(manCapture1(k,UL,next)) {board[i]=FREE;return true;}
           if(manCapture1(k,DR,next)) {board[i]=FREE;return true;}
         }
         if(manCapture1(k,direction,next)) {board[i]=FREE;return true;}
       }
 
       if((!next) && k==to) {board[i]=FREE;return true;}
 
       board[k]=FREE;
       board[i]=save;
       board[from]=MAN1;
@@ -241,117 +247,123 @@ bool RCheckers::kingCapture1(int from,int direction,bool &capture)
 // Computer Functions
 //
 ////////////////////////////////////////////////////
 
 
 void RCheckers::kingMove2(int from,int &resMax)
 {
   board[from]=FREE;
   for(int i=from-6;board[i]==FREE;i-=6)
   {
     board[i]=KING2;
     turn(resMax);
     board[i]=FREE;
   }
   for(int i=from-5;board[i]==FREE;i-=5)
   {
     board[i]=KING2;
     turn(resMax);
     board[i]=FREE;
   }
   for(int i=from+5;board[i]==FREE;i+=5)
   {
     board[i]=KING2;
     turn(resMax);
     board[i]=FREE;
   }
   for(int i=from+6;board[i]==FREE;i+=6)
   {
     board[i]=KING2;
     turn(resMax);
     board[i]=FREE;
   }
   board[from]=KING2;
 }
 
 
 bool RCheckers::checkCapture2()
 {
   for(int i=6;i<48;i++)
   {
     switch(board[i])
     {
       case MAN2:
         if(board[i-6]==MAN1 || board[i-6]==KING1)
           if(board[i-12]==FREE) return true;
         if(board[i-5]==MAN1 || board[i-5]==KING1)
           if(board[i-10]==FREE) return true;
         if(board[i+5]==MAN1 || board[i+5]==KING1)
-          if(board[i+10]==FREE) return true;
+          if(board[((i+10) < 54) ? i+10 : 53]==FREE) return true;
         if(board[i+6]==MAN1 || board[i+6]==KING1)
-          if(board[i+12]==FREE) return true;
+          if(board[((i+12) < 54) ? i+12 : 53]==FREE) return true;
         break;
       case KING2:
         int k;
         for(k=i-6;board[k]==FREE;k-=6);
         if(board[k]==MAN1 || board[k]==KING1)
           if(board[k-6]==FREE) return true;
 
         for(k=i-5;board[k]==FREE;k-=5);
         if(board[k]==MAN1 || board[k]==KING1)
           if(board[k-5]==FREE) return true;
 
-        for(k=i+5;board[k]==FREE;k+=5);
+        for(k=i+5;board[k]==FREE;k+=5) {
+          if (k>=49)
+            break;
+        }
         if(board[k]==MAN1 || board[k]==KING1)
-          if(board[k+5]==FREE) return true;
+          if(board[((k+5) < 54) ? k+5 : 53]==FREE) return true;
 
-        for(k=i+6;board[k]==FREE;k+=6);
+        for(k=i+6;board[k]==FREE;k+=6) {
+          if (k>=48)
+            break;
+        }
         if(board[k]==MAN1 || board[k]==KING1)
-          if(board[k+6]==FREE) return true;
+          if(board[((k+6) < 54) ? k+6 : 53]==FREE) return true;
     }
   }
   return false;
 }
 
 
 // Return TRUE if it is possible to capture
 // Return FALSE if it is impossible to capture
 
 bool RCheckers::manCapture2(int from,int &resMax)
 {
   bool capture=false;
 
   int i=from-6;
   if(board[i]==MAN1 || board[i]==KING1)
   {
     int k=from-12;
     if(board[k]==FREE)
     {
       int save=board[i];
       board[from]=FREE;
       board[i]=NONE;
       board[k]=MAN2;
       resMax--;
       if(!manCapture2(k,resMax)) turn(resMax,true);
       resMax++;
       board[k]=FREE;
       board[i]=save;
       board[from]=MAN2;
       capture=true;
     }
   }
 
   i=from-5;
   if(board[i]==MAN1 || board[i]==KING1)
   {
     int k=from-10;
     if(board[k]==FREE)
     {
       int save=board[i];
       board[from]=FREE;
       board[i]=NONE;
       board[k]=MAN2;
       resMax--;
       if(!manCapture2(k,resMax)) turn(resMax,true);
       resMax++;
       board[k]=FREE;
       board[i]=save;