diff options
author | Antoine Cellerier <dionoea@videolan.org> | 2006-09-03 16:54:42 +0000 |
---|---|---|
committer | Antoine Cellerier <dionoea@videolan.org> | 2006-09-03 16:54:42 +0000 |
commit | 48865c45f102a8b32c653f7fc493b3c9686ad6be (patch) | |
tree | 18dfa51bdfdc2fb1dc93fbcce581e90cc5865284 | |
parent | 86171f28cce7cc85b9ed47d141118ff50285b535 (diff) | |
download | rockbox-48865c45f102a8b32c653f7fc493b3c9686ad6be.tar.gz 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
-rw-r--r-- | apps/plugins/solitaire.c | 9 |
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; | |||
208 | ": Select cards, Move cards, reveal hidden cards ..." | 208 | ": Select cards, Move cards, reveal hidden cards ..." |
209 | #define HELP_SOL_DRAW HK_DRAW \ | 209 | #define HELP_SOL_DRAW HK_DRAW \ |
210 | ": Un-select a card if it was selected. " \ | 210 | ": Un-select a card if it was selected. " \ |
211 | "Else, draw 3 new cards out of the remains' stack." | 211 | "Else, draw new cards out of the remains' stack." |
212 | #define HELP_SOL_REM2CUR HK_REM2CUR \ | 212 | #define HELP_SOL_REM2CUR HK_REM2CUR \ |
213 | ": Put the card on top of the remains' stack on top of the cursor." | 213 | ": Put the card on top of the remains' stack on top of the cursor." |
214 | #define HELP_SOL_CUR2STACK HK_CUR2STACK \ | 214 | #define HELP_SOL_CUR2STACK HK_CUR2STACK \ |
@@ -937,7 +937,8 @@ unsigned char find_last_card( unsigned char col ) | |||
937 | } | 937 | } |
938 | else | 938 | else |
939 | { | 939 | { |
940 | c = rem; | 940 | //c = rem; |
941 | c = cur_rem; | ||
941 | } | 942 | } |
942 | 943 | ||
943 | if(c == NOT_A_CARD) | 944 | if(c == NOT_A_CARD) |
@@ -1216,8 +1217,8 @@ int solitaire( void ) | |||
1216 | } | 1217 | } |
1217 | 1218 | ||
1218 | /* draw the remains */ | 1219 | /* draw the remains */ |
1219 | if( ( cur_rem == NOT_A_CARD && rem != NOT_A_CARD ) | 1220 | if( rem != NOT_A_CARD && |
1220 | || deck[cur_rem].next != NOT_A_CARD ) | 1221 | ( cur_rem == NOT_A_CARD || deck[cur_rem].next != NOT_A_CARD ) ) |
1221 | { | 1222 | { |
1222 | /* gruik ! (we want to display a card back) */ | 1223 | /* gruik ! (we want to display a card back) */ |
1223 | deck[rem].known = false; | 1224 | deck[rem].known = false; |