summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAntoine Cellerier <dionoea@videolan.org>2006-09-03 16:54:42 +0000
committerAntoine Cellerier <dionoea@videolan.org>2006-09-03 16:54:42 +0000
commit48865c45f102a8b32c653f7fc493b3c9686ad6be (patch)
tree18dfa51bdfdc2fb1dc93fbcce581e90cc5865284 /apps
parent86171f28cce7cc85b9ed47d141118ff50285b535 (diff)
downloadrockbox-48865c45f102a8b32c653f7fc493b3c9686ad6be.tar.gz
rockbox-48865c45f102a8b32c653f7fc493b3c9686ad6be.tar.bz2
rockbox-48865c45f102a8b32c653f7fc493b3c9686ad6be.zip
Fix some more bugs found by amiconn:
(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
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/solitaire.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 1c4746f7dc..0d3b79ef57 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -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;