From 66eeeae7d69658c7eb1abb8f99efac57ac07c513 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 23 Jan 2005 17:28:29 +0000
Subject: [PATCH] change trayCursorLoc to be a 3-bit number so stores smaller

---
 xwords4/common/tray.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xwords4/common/tray.c b/xwords4/common/tray.c
index cc69e15e8..c5023c348 100644
--- a/xwords4/common/tray.c
+++ b/xwords4/common/tray.c
@@ -174,7 +174,7 @@ drawTray( BoardCtxt* board, XP_Bool focussed )
 
 #ifdef KEYBOARD_NAV
                 if ( showFaces ) {
-                    TileBit cursorLoc = board->trayCursorLoc[turn];
+                    TileBit cursorLoc = 1 << board->trayCursorLoc[turn];
                     if ( !!cursorLoc ) {
                         XP_U16 index = indexForBits( cursorLoc );
                         figureTrayTileRect( board, index, &tileRect );
@@ -639,7 +639,7 @@ tray_moveCursor( BoardCtxt* board, XP_Key cursorKey )
                                                    selPlayer );
     XP_U16 pos;
     TileBit newSel;
-    TileBit oldSel = board->trayCursorLoc[selPlayer];
+    TileBit oldSel = 1 << board->trayCursorLoc[selPlayer];
 
     numTrayTiles = MAX_TRAY_TILES;
 
@@ -656,10 +656,11 @@ tray_moveCursor( BoardCtxt* board, XP_Key cursorKey )
         } else if ( cursorKey == XP_CURSOR_KEY_RIGHT ) {
             ++pos;
         }
+        
+        pos %= numTrayTiles;
+        board->trayCursorLoc[selPlayer] = pos;
+        newSel = 1 << pos;
 
-        newSel = 1 << (pos % numTrayTiles);
-
-        board->trayCursorLoc[selPlayer] = newSel;
         board_invalTrayTiles( board, newSel | oldSel );
         result = XP_TRUE;
     }
@@ -670,7 +671,7 @@ tray_moveCursor( BoardCtxt* board, XP_Key cursorKey )
 XP_Bool
 tray_keyAction( BoardCtxt* board )
 {
-    TileBit cursor = board->trayCursorLoc[board->selPlayer];
+    TileBit cursor = 1 << board->trayCursorLoc[board->selPlayer];
     XP_Bool result;
     if ( !!cursor ) {
         XP_S16 index = trayLocToIndex( board, indexForBits( cursor ) );