1.1 --- a/Source/Player.h	Thu Jul 03 17:44:30 2008 -0700
     1.2 +++ b/Source/Player.h	Tue Jul 08 13:12:01 2008 -0700
     1.3 @@ -14,8 +14,9 @@
     1.4  @interface Player : NSObject <NSCoding>
     1.5  {
     1.6      Game *_game;
     1.7 -    NSString *_name, *_uuid, *_address, *_addressType;
     1.8 +    NSString *_name;
     1.9      BOOL _local;
    1.10 +    NSMutableDictionary *_extraValues;
    1.11  }
    1.12  
    1.13  - (id) initWithGame: (Game*)game;
    1.14 @@ -24,18 +25,16 @@
    1.15  - (id) initWithCoder: (NSCoder*)decoder;
    1.16  - (void) encodeWithCoder: (NSCoder*)coder;
    1.17  
    1.18 +@property (copy) NSString *name;                            // Display name
    1.19 +@property (readonly) CGImageRef icon;                       // An icon to display (calls game.iconForPlayer:)
    1.20 +
    1.21  @property (readonly) Game *game;
    1.22 -@property (copy) NSString *name,                            // Display name
    1.23 -                          *UUID,                            // Address Book UUID
    1.24 -                          *address,                         // Contact address
    1.25 -                          *addressType;                     // Contact address type (an AB property type)
    1.26  @property (readonly) int index;                             // Player's index in the Game's -players array
    1.27 -@property (readwrite,getter=isLocal) BOOL local;            // Is the player on this computer? (Defaults to YES)
    1.28 +@property (readwrite,getter=isLocal) BOOL local;            // Is player a human at this computer? (Defaults to YES)
    1.29  @property (readonly, getter=isCurrent) BOOL current;        // Is it this player's turn?
    1.30  @property (readonly, getter=isFriendly) BOOL friendly;      // Is this player the current player or an ally?
    1.31  @property (readonly, getter=isUnfriendly) BOOL unfriendly;  // Is this player an opponent of the current player?
    1.32  @property (readonly) Player *nextPlayer, *previousPlayer;   // The next/previous player in sequence
    1.33 -@property (readonly) CGImageRef icon;
    1.34  @end
    1.35  
    1.36