diff -r 3eb7be1dd7b6 -r 45c82a071aca Source/CheckersGame.m
--- a/Source/CheckersGame.m	Mon Mar 10 17:30:57 2008 -0700
+++ b/Source/CheckersGame.m	Wed May 28 12:47:10 2008 -0700
@@ -30,46 +30,34 @@
 @implementation CheckersGame
 
 
-- (void) addPieces: (NSString*)imageName
-            toGrid: (Grid*)grid
-         forPlayer: (int)playerNum
-              rows: (NSRange)rows
-       alternating: (BOOL)alternating
+- (Piece*) pieceForPlayer: (int)playerNum
 {
-    Piece *prototype = [[Piece alloc] initWithImageNamed: imageName scale: floor(grid.spacing.width * 0.8)];
-    prototype.owner = [self.players objectAtIndex: playerNum];
-    unsigned cols=grid.columns;
-    for( unsigned row=rows.location; row<NSMaxRange(rows); row++ )
-        for( unsigned col=0; col<cols; col++ ) {
-            if( !alternating || ((row+col) & 1) == 0 ) {
-                GridCell *cell = [grid cellAtRow: row column: col];
-                if( cell ) {
-                    Piece *piece = [prototype copy];
-                    cell.bit = piece;
-                    [piece release];
-                    //cell.bit.rotation = random() % 360; // keeps pieces from looking too samey
-                    _numPieces[playerNum]++;
-                }
-            }
-        }
-    [prototype release];
+    Piece *p = [[Piece alloc] initWithImageNamed: (playerNum==0 ?@"Green Ball.png" :@"Red Ball.png") 
+                                           scale: floor(_grid.spacing.width * 0.8)];
+    p.owner = [self.players objectAtIndex: playerNum];
+    p.name = playerNum ?@"2" :@"1";
+    return [p autorelease];
 }
 
-
 - (Grid*) x_makeGrid
 {
     RectGrid *grid = [[[RectGrid alloc] initWithRows: 8 columns: 8 frame: _board.bounds] autorelease];
-    CGPoint pos = grid.position;
+    _grid = grid;
+    CGPoint pos = _grid.position;
     pos.x = floor((_board.bounds.size.width-grid.frame.size.width)/2);
-    [grid addAllCells];
     grid.position = pos;
     grid.allowsMoves = YES;
     grid.allowsCaptures = NO;
     grid.cellColor = CreateGray(0.0, 0.25);
     grid.altCellColor = CreateGray(1.0, 0.25);
     grid.lineColor = nil;
-    [self addPieces: @"Green Ball.png" toGrid: grid forPlayer: 0 rows: NSMakeRange(0,3) alternating: YES];
-    [self addPieces: @"Red Ball.png"   toGrid: grid forPlayer: 1 rows: NSMakeRange(5,3) alternating: YES];
+
+    [grid addAllCells];
+    for( int i=0; i<32; i++ ) {
+        int row = i/4;
+        [_cells addObject: [_grid cellAtRow: row column: 2*(i%4) + (row&1)]];
+    }
+    self.stateString = @"111111111111--------222222222222";
     return grid;
 }
 
@@ -79,12 +67,56 @@
     self = [super initWithBoard: board];
     if (self != nil) {
         [self setNumberOfPlayers: 2];
-        [board addSublayer: [self x_makeGrid]];
+        _cells = [[NSMutableArray alloc] init];
+        [self x_makeGrid];
+        [board addSublayer: _grid];
         [self nextPlayer];
+        
+        PreloadSound(@"Tink");
+        PreloadSound(@"Funk");
+        PreloadSound(@"Blow");
+        PreloadSound(@"Pop");
     }
     return self;
 }
 
+- (void) dealloc
+{
+    [_cells release];
+    [_grid release];
+    [super dealloc];
+}
+
+
+- (NSString*) stateString
+{
+    unichar state[_cells.count];
+    int i = 0;
+    for( GridCell *cell in _cells ) {
+        NSString *ident = cell.bit.name;
+        if( ident )
+            state[i++] = [ident characterAtIndex: 0];
+        else
+            state[i++] = '-';
+    }
+    return [NSString stringWithCharacters: state length: i];
+}
+
+- (void) setStateString: (NSString*)state
+{
+    _numPieces[0] = _numPieces[1] = 0;
+    int i = 0;
+    for( GridCell *cell in _cells ) {
+        Piece *piece;
+        switch( [state characterAtIndex: i++] ) {
+            case '1': piece = [self pieceForPlayer: 0]; _numPieces[0]++; break;
+            case '2': piece = [self pieceForPlayer: 1]; _numPieces[1]++; break;
+            default:  piece = nil; break;
+        }
+        cell.bit = piece;
+    }    
+}
+
 
 - (BOOL) canBit: (Bit*)bit moveFrom: (id<BitHolder>)srcHolder to: (id<BitHolder>)dstHolder
 {
@@ -101,8 +133,12 @@
 {
     Square *src=(Square*)srcHolder, *dst=(Square*)dstHolder;
     int playerIndex = self.currentPlayer.index;
+    
+    if( self.currentMove.length==0 )
+        [self.currentMove appendString: src.name];
+    [self.currentMove appendString: dst.name];
+    
     BOOL isKing = ([bit valueForKey: @"King"] != nil);
-    
     PlaySound(isKing ?@"Funk" :@"Tink");
 
     // "King" a piece that made it to the last row:
@@ -154,4 +190,22 @@
 }
 
 
+- (BOOL) applyMoveString: (NSString*)move
+{
+    int length = move.length;
+    if( length<4 || (length&1) )
+        return NO;
+    GridCell *src = nil;
+    for( int i=0; i<length; i+=2 ) {
+        NSString *ident = [move substringWithRange: NSMakeRange(i,2)];
+        GridCell *dst = [_grid cellWithName: ident];
+        if( i > 0 )
+            if( ! [self animateMoveFrom: src to: dst] )
+                return NO;
+        src = dst;
+    }
+    return YES;
+}
+
+
 @end