Change length of line to SIZE*2

- Move config.h to include/
- Move config.mk to root
- Remove $RM from configure

Makefile

@@ -1,9 +1,6 @@
-OUT = game
+include config.mk
-CFLAGS =
+
-LDFLAGS =
 INCLUDE = -Iinclude
-CC  = cc
-LD  = ld
 RM  = rm -f
 SRCDIR = src
 OBJDIR = obj

config.mk

@@ -0,0 +1,4 @@
+CC = cc
+CFLAGS = 
+LDFLAGS = 
+OUT = game

configure

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+if [[ "$*" == *"--help"* ]] || [[ "$*" == *"-h"* ]]
+then
+    echo "Use environment variables to pass values:
+    CC      - compiler (default: cc)
+    CFLAGS  - flags for compiler
+    LDFLAGS - flags for linker
+    OUT     - out file (default: game
+    SIZE    - size of game field
+    DEFX    - start x
+    DEFY    - start y"
+    exit 1
+fi
+
+CC=${CC:-cc}
+CFLAGS=${CFLAGS:-}
+LDFLAGS=${LDFLAGS:-}
+OUT=${OUT:-game}
+SIZE=${SIZE:-10}
+DEFX=${DEFX:-0}
+DEFY=${DEFY:-0}
+
+echo "Makefile configuration:"
+echo "Compiler: $CC"
+echo "CFLAGS: $CFLAGS"
+echo "LDFLAGS: $LDFLAGS"
+echo "Out file: $OUT"
+echo
+echo "Code configuration:"
+echo "Size: $SIZE"
+echo "Start x: $DEFX"
+echo "Start y: $DEFY"
+
+echo "CC = $CC
+CFLAGS = $CFLAGS
+LDFLAGS = $LDFLAGS
+OUT = $OUT" > config.mk
+
+echo "#define SIZE $SIZE
+#define DEFX $DEFX
+#define DEFY $DEFY" > include/config.h

include/config.h

@@ -0,0 +1,3 @@
+#define SIZE 10
+#define DEFX 0
+#define DEFY 0

include/input.h

@@ -9,6 +9,6 @@ typedef struct input_args_t
     bool *alive;
 } InputArgs;
 
-void *input(void *vargp);
+int input(void *vargp);
 
 #endif /* __INPUT_H__ */

include/screen.h

@@ -1,13 +1,13 @@
 #ifndef __SCREEN_H__
 #define __SCREEN_H__
 
+typedef char Point;
 typedef struct screen_t
 {
     int width;
     int height;
-    char *screen;
+    Point *screen;
 } Screen;
-typedef char Point;
 
 Screen *screenCreate(int width, int height, Point fill_value);
 void screenFree(Screen *screen);

src/input.c

@@ -22,7 +22,7 @@ char getch(void)
     return buf;
 }
 
-void *input(void *vargp)
+int input(void *vargp)
 {
     char *out = ((InputArgs *)vargp)->out;
     bool *alive = ((InputArgs *)vargp)->alive;
@@ -31,5 +31,5 @@ void *input(void *vargp)
     {
         *out = getch();
     }
-    return NULL;
+    return 0;
 }

src/main.c

@@ -1,14 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <pthread.h>
+#include <threads.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "input.h"
 #include "screen.h"
 #include "player.h"
 #include "food.h"
+#include "config.h"
 
 void drawPlayer(Player *player, Screen *screen)
 {
@@ -22,18 +22,24 @@ Food generateFood(Player *player)
     Food food;
     do
     {
-        food = (Food){random() % 10, random() % 10};
+        food = (Food){random() % SIZE, random() % SIZE};
     } while (playerCheckFoodCollision(player, food));
     return food;
 }
 
+void resetCoordinates(void)
+{
+    printf("\e[1;1H\e[2J");
+}
+
 int main(int argc, char **argv)
 {
     srandom(time(NULL));
-    Player *player = playerCreate(DOWN, 0, 0, 0);
+    Player *player = playerCreate(DOWN, DEFX, DEFY, 0);
-    Screen *screen = screenCreate(10, 10, ' ');
+    Screen *screen = screenCreate(SIZE, SIZE, ' ');
     PlayerNode *node;
-    pthread_t input_thread;
+    thrd_t input_thread;
+    int i;
     int head_x, head_y;
     Food food = generateFood(player);
 
@@ -41,7 +47,7 @@ int main(int argc, char **argv)
     char *key = malloc(sizeof(char)); *key = 0;
     InputArgs input_args = (InputArgs){ key, running };
 
-    pthread_create(&input_thread, NULL, input, &input_args);
+    thrd_create(&input_thread, input, &input_args);
     while (*running)
     {
         switch (*key)
@@ -56,7 +62,6 @@ int main(int argc, char **argv)
                 player->direction = DOWN; break;
             case 'a':
                 player->direction = LEFT; break;
-            sleep(1);
         }
 
         if (playerDoTick(player, food))
@@ -68,7 +73,7 @@ int main(int argc, char **argv)
         }
         head_x = player->head->x;
         head_y = player->head->y;
-        if (head_x >= 10 || head_x < 0 || head_y >= 10 || head_y < 0)
+        if (head_x >= SIZE || head_x < 0 || head_y >= SIZE || head_y < 0)
         {
             *running = false;
             break;
@@ -77,9 +82,12 @@ int main(int argc, char **argv)
         screenSet(screen, ' ');
         drawPlayer(player, screen);
         *screenGetPoint(screen, food.x, food.y) = '@';
+        resetCoordinates();
         screenShow(screen);
+        for (i = 0; i < SIZE*2; ++i) putchar('-');
+        printf("\nScore: %d\n", player->score);
 
-        sleep(1);
+        thrd_sleep(&(struct timespec){.tv_sec=1}, NULL);
     }
     return 0;
 }

src/player.c

@@ -15,6 +15,8 @@ Player *playerCreate(Direction direction, int x, int y, int score)
     player->head = head;
     player->score = score;
     player->direction = direction;
+
+    return player;
 }
 
 void playerFree(Player *player)
@@ -34,7 +36,7 @@ bool playerCheckSelfCollision(Player *player)
     PlayerNode *nodei, *nodej;
     for (nodei = player->tail; nodei != NULL; nodei = nodei->next)
         for (nodej = nodei->next; nodej != NULL; nodej = nodej->next)
-            if (nodei->x == nodej->x && nodei->y == nodej->x)
+            if (nodei->x == nodej->x && nodei->y == nodej->y)
                 return true;
     return false;
 }

src/screen.c

@@ -44,7 +44,7 @@ void screenShow(Screen *screen)
     }
 }
 
-void screenSet(Screen *screen, char fill_value)
+void screenSet(Screen *screen, Point fill_value)
 {
     memset(screen->screen, fill_value, screen->width * screen->height * sizeof(char));
 }