about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-03-26 18:15:31 -0400
committerJune McEnroe <june@causal.agency>2019-03-26 18:15:31 -0400
commit77d344c1ab4e274ba099d66b8bf5eb9db7e5e45f (patch)
treec561c1ed60677771d45582ce2b878f0e4ad09786
parentImplement loadPE (diff)
downloadcards-77d344c1ab4e274ba099d66b8bf5eb9db7e5e45f.tar.gz
cards-77d344c1ab4e274ba099d66b8bf5eb9db7e5e45f.zip
Remove stackDeck
Other games will probably want to do it differently.
Diffstat (limited to '')
-rw-r--r--sol.c4
-rw-r--r--stack.h7
2 files changed, 3 insertions, 8 deletions
diff --git a/sol.c b/sol.c
index b4a323f..4da4933 100644
--- a/sol.c
+++ b/sol.c
@@ -82,7 +82,9 @@ static void gameDeal(void) {
 	for (uint i = 0; i < StacksLen; ++i) {
 		stackClear(&stacks[i]);
 	}
-	stackDeck(&stacks[Stock]);
+	for (Card i = 1; i <= 52; ++i) {
+		stackPush(&stacks[Stock], -i);
+	}
 	stackShuffle(&stacks[Stock]);
 	for (uint i = Tableau1; i <= Tableau7; ++i) {
 		stackMoveTo(&stacks[i], &stacks[Stock], i - Tableau1);
diff --git a/stack.h b/stack.h
index d3a4119..b7b018f 100644
--- a/stack.h
+++ b/stack.h
@@ -85,13 +85,6 @@ static inline void stackMoveTo(struct Stack *dst, struct Stack *src, Uint8 n) {
 	src->len -= n;
 }
 
-static inline void stackDeck(struct Stack *stack) {
-	stackClear(stack);
-	for (Card i = 1; i <= 52; ++i) {
-		stackPush(stack, -i);
-	}
-}
-
 static inline int randUniform(int bound) {
 	for (;;) {
 		int r = rand();