Finished putting stuff where they belong.
This commit is contained in:
parent
276a4137bc
commit
dcab55f853
@ -4,6 +4,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <ncurses.h>
|
#include <ncurses.h>
|
||||||
|
#include "game.h"
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
|
|
||||||
static char *card_suit(enum suit suit) {
|
static char *card_suit(enum suit suit) {
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include "stack.h"
|
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
24
lib/game.h
24
lib/game.h
@ -1,11 +1,35 @@
|
|||||||
#ifndef GAME_H
|
#ifndef GAME_H
|
||||||
#define GAME_H
|
#define GAME_H
|
||||||
|
|
||||||
|
#include "stack.h"
|
||||||
#include "deck.h"
|
#include "deck.h"
|
||||||
#include "cursor.h"
|
#include "cursor.h"
|
||||||
|
|
||||||
#define NUMBER_OF_CARDS 52
|
#define NUMBER_OF_CARDS 52
|
||||||
|
|
||||||
|
#define MANEUVRE_STACKS_STARTING_Y 7
|
||||||
|
|
||||||
|
#define STOCK_STARTING_X 1
|
||||||
|
#define STOCK_STARTING_Y 1
|
||||||
|
|
||||||
|
#define WASTE_PILE_STARTING_X 9
|
||||||
|
#define WASTE_PILE_STARTING_Y 1
|
||||||
|
|
||||||
|
#define FOUNDATION_STARTING_Y 1
|
||||||
|
#define FOUNDATION_0_STARTING_X 25
|
||||||
|
#define FOUNDATION_1_STARTING_X 33
|
||||||
|
#define FOUNDATION_2_STARTING_X 41
|
||||||
|
#define FOUNDATION_3_STARTING_X 49
|
||||||
|
|
||||||
|
#define MANEUVRE_STARTING_Y 9
|
||||||
|
#define MANEUVRE_0_STARTING_X 1
|
||||||
|
#define MANEUVRE_1_STARTING_X 9
|
||||||
|
#define MANEUVRE_2_STARTING_X 17
|
||||||
|
#define MANEUVRE_3_STARTING_X 25
|
||||||
|
#define MANEUVRE_4_STARTING_X 33
|
||||||
|
#define MANEUVRE_5_STARTING_X 41
|
||||||
|
#define MANEUVRE_6_STARTING_X 49
|
||||||
|
|
||||||
extern const char *program_name;
|
extern const char *program_name;
|
||||||
struct deck *deck;
|
struct deck *deck;
|
||||||
struct cursor *cursor;
|
struct cursor *cursor;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "card.h"
|
#include "card.h"
|
||||||
#include "stack.h"
|
#include "game.h"
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
|
|
||||||
|
23
lib/stack.h
23
lib/stack.h
@ -3,29 +3,6 @@
|
|||||||
|
|
||||||
#include "card.h"
|
#include "card.h"
|
||||||
|
|
||||||
#define MANEUVRE_STACKS_STARTING_Y 7
|
|
||||||
|
|
||||||
#define STOCK_STARTING_X 1
|
|
||||||
#define STOCK_STARTING_Y 1
|
|
||||||
|
|
||||||
#define WASTE_PILE_STARTING_X 9
|
|
||||||
#define WASTE_PILE_STARTING_Y 1
|
|
||||||
|
|
||||||
#define FOUNDATION_STARTING_Y 1
|
|
||||||
#define FOUNDATION_0_STARTING_X 25
|
|
||||||
#define FOUNDATION_1_STARTING_X 33
|
|
||||||
#define FOUNDATION_2_STARTING_X 41
|
|
||||||
#define FOUNDATION_3_STARTING_X 49
|
|
||||||
|
|
||||||
#define MANEUVRE_STARTING_Y 9
|
|
||||||
#define MANEUVRE_0_STARTING_X 1
|
|
||||||
#define MANEUVRE_1_STARTING_X 9
|
|
||||||
#define MANEUVRE_2_STARTING_X 17
|
|
||||||
#define MANEUVRE_3_STARTING_X 25
|
|
||||||
#define MANEUVRE_4_STARTING_X 33
|
|
||||||
#define MANEUVRE_5_STARTING_X 41
|
|
||||||
#define MANEUVRE_6_STARTING_X 49
|
|
||||||
|
|
||||||
struct stack {
|
struct stack {
|
||||||
struct card *card;
|
struct card *card;
|
||||||
struct stack *next;
|
struct stack *next;
|
||||||
|
Loading…
Reference in New Issue
Block a user