Change length of line to SIZE*2

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

.gitignore

@@ -1,3 +1,2 @@
 obj/
 game
-config/

Makefile

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

config.mk

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

configure

@@ -14,7 +14,6 @@ then
 fi
 
 CC=${CC:-cc}
-RM=${RM:-rm -f}
 CFLAGS=${CFLAGS:-}
 LDFLAGS=${LDFLAGS:-}
 OUT=${OUT:-game}
@@ -24,7 +23,6 @@ DEFY=${DEFY:-0}
 
 echo "Makefile configuration:"
 echo "Compiler: $CC"
-echo "Remove: $RM"
 echo "CFLAGS: $CFLAGS"
 echo "LDFLAGS: $LDFLAGS"
 echo "Out file: $OUT"
@@ -34,19 +32,11 @@ echo "Size: $SIZE"
 echo "Start x: $DEFX"
 echo "Start y: $DEFY"
 
-if ! test -d config; then
-    if test -f config; then
-        rm config
-    fi
-    mkdir config
-fi
-
 echo "CC = $CC
-RM = $RM
 CFLAGS = $CFLAGS
 LDFLAGS = $LDFLAGS
-OUT = $OUT" > config/config.mk
+OUT = $OUT" > config.mk
 
 echo "#define SIZE $SIZE
 #define DEFX $DEFX
-#define DEFY $DEFY" > config/config.h
+#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,8 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <pthread.h>
+#include <threads.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "input.h"
@@ -28,13 +27,19 @@ Food generateFood(Player *player)
     return food;
 }
 
+void resetCoordinates(void)
+{
+    printf("\e[1;1H\e[2J");
+}
+
 int main(int argc, char **argv)
 {
     srandom(time(NULL));
     Player *player = playerCreate(DOWN, DEFX, DEFY, 0);
     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);
 
@@ -42,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)
@@ -57,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))
@@ -78,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));
 }