Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some more bugs found by amiconn:

Browse source 
(1) The bug I already described yesterday: If the draw
    stack becomes completely empty, it reappears. Slightly
    irritating
(2) When the cursor is placed on the remains' stack when
    there is no card, and then a card is drawn, the cursor
    disappears
(4) (easy one) The help texts refer to drawing 3 new cards,
    but solitaire now has selectable draw one / draw three


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10873 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Antoine Cellerier 2006-09-03 16:54:42 +00:00
parent 86171f28cc
commit 48865c45f1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/plugins/solitaire.c
View file

@ -208,7 +208,7 @@ static struct plugin_api* rb;
": Select cards, Move cards, reveal hidden cards ..."
#define HELP_SOL_DRAW HK_DRAW \
": Un-select a card if it was selected. " \
"Else, draw 3 new cards out of the remains' stack."
"Else, draw new cards out of the remains' stack."
#define HELP_SOL_REM2CUR HK_REM2CUR \
": Put the card on top of the remains' stack on top of the cursor."
#define HELP_SOL_CUR2STACK HK_CUR2STACK \
@ -937,7 +937,8 @@ unsigned char find_last_card( unsigned char col )
}
else
{
c = rem;
//c = rem;
c = cur_rem;
}
if(c == NOT_A_CARD)
@ -1216,8 +1217,8 @@ int solitaire( void )
}
/* draw the remains */
if( ( cur_rem == NOT_A_CARD && rem != NOT_A_CARD )
|| deck[cur_rem].next != NOT_A_CARD )
if( rem != NOT_A_CARD &&
( cur_rem == NOT_A_CARD || deck[cur_rem].next != NOT_A_CARD ) )
{
/* gruik ! (we want to display a card back) */
deck[rem].known = false;