diff options
| -rw-r--r-- | src/card.c (renamed from src/common.c) | 17 | ||||
| -rw-r--r-- | src/card.h | 10 | ||||
| -rw-r--r-- | src/cardstack.c | 14 | ||||
| -rw-r--r-- | src/cardstack.h | 13 | ||||
| -rw-r--r-- | src/common.h | 16 | ||||
| -rw-r--r-- | src/hand.h | 10 | ||||
| -rw-r--r-- | src/main.c | 4 |
7 files changed, 51 insertions, 33 deletions
diff --git a/src/common.c b/src/card.c index 89841c4..73808a4 100644 --- a/src/common.c +++ b/src/card.c @@ -1,7 +1,7 @@ -#include "common.h" +#include "card.h" #include <assert.h> -uint32_t cardpoints(const card c) +uint32_t card_get_points(const card c) { assert(c > 0 && c <= 105); if (55 == c) return 7; // Card 55 is worth of 7 points @@ -10,16 +10,3 @@ uint32_t cardpoints(const card c) if (c % 5 == 0) return 2; // ... 5 are worth 2 points return 1; // All other cards are worth 1 point } - -uint32_t stackpoints(const cardstack s) -{ - uint32_t points = 0; - - for(uint32_t i = 0; i < MAX_CARDSTACK_SIZE; i++) - { - if(s[i] > 0) - points += cardpoints(s[i]); - } - - return points; -} diff --git a/src/card.h b/src/card.h new file mode 100644 index 0000000..2ec3ea4 --- /dev/null +++ b/src/card.h @@ -0,0 +1,10 @@ +#ifndef OXEN_CARD_H +#define OXEN_CARD_H + +#include <stdint.h> + +typedef char card; + +uint32_t card_get_points(const card c); + +#endif // OXEN_CARD_H diff --git a/src/cardstack.c b/src/cardstack.c new file mode 100644 index 0000000..a623b1b --- /dev/null +++ b/src/cardstack.c @@ -0,0 +1,14 @@ +#include "cardstack.h" + +uint32_t cardstack_get_points(const cardstack s) +{ + uint32_t points = 0; + + for(int i = 0; i < MAX_CARDSTACK_SIZE; i++) + { + if(s[i] > 0) + points += card_get_points(s[i]); + } + + return points; +} diff --git a/src/cardstack.h b/src/cardstack.h new file mode 100644 index 0000000..d77996d --- /dev/null +++ b/src/cardstack.h @@ -0,0 +1,13 @@ +#ifndef OXEN_CARDSTACK_H +#define OXEN_CARDSTACK_H + +#include <stdint.h> +#include "card.h" + +#define MAX_CARDSTACK_SIZE 5 + +typedef card cardstack[MAX_CARDSTACK_SIZE]; + +uint32_t cardstack_get_points(const cardstack s); + +#endif // OXEN_CARDSTACK_H diff --git a/src/common.h b/src/common.h deleted file mode 100644 index 5bd31f7..0000000 --- a/src/common.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef OXEN_COMMON_H -#define OXEN_COMMON_H - -#include <stdint.h> - -#define MAX_CARDSTACK_SIZE 5 -#define MAX_HAND_SIZE 10 - -typedef char card; -typedef card cardstack[MAX_CARDSTACK_SIZE]; -typedef card hand[MAX_HAND_SIZE]; - -uint32_t cardpoints(const card c); -uint32_t stackpoints(const cardstack s); - -#endif // OXEN_COMMON_H diff --git a/src/hand.h b/src/hand.h new file mode 100644 index 0000000..9268fd8 --- /dev/null +++ b/src/hand.h @@ -0,0 +1,10 @@ +#ifndef OXEN_HAND_H +#define OXEN_HAND_H + +#include "card.h" + +#define MAX_HAND_SIZE 10 + +typedef card hand[MAX_HAND_SIZE]; + +#endif // OXEN_HAND_H @@ -3,7 +3,7 @@ #include <unistd.h> #include <curses.h> #include "display.h" -#include "common.h" +#include "card.h" int main(int argc, char **argv) { @@ -14,7 +14,7 @@ int main(int argc, char **argv) display_fini(); for (int i = 1; i <= 105; i++) - printf("%d:%d\n", i, cardpoints(i)); + printf("%d:%d\n", i, card_get_points(i)); return EXIT_SUCCESS; } |