Compare commits

..

No commits in common. "40dc962d5ec28f0c3b42bc257e567375925f2ae4" and "d6eef4c404086c01118e27744d8e5766730dabde" have entirely different histories.

4 changed files with 8 additions and 24 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
obj/ obj/
game game
config/ config.mk

View File

@ -1,9 +1,7 @@
include config/config.mk
OUT = game OUT = game
CFLAGS = CFLAGS =
LDFLAGS = LDFLAGS =
INCLUDE = -Iinclude -Iconfig INCLUDE = -Iinclude
CC = cc CC = cc
LD = ld LD = ld
RM = rm -f RM = rm -f
@ -24,6 +22,6 @@ $(OUT): obj $(OBJ)
$(CC) -o $@ $(OBJ) $(LDFLAGS) $(CC) -o $@ $(OBJ) $(LDFLAGS)
clean: clean:
$(RM) $(OUT) $(OBJDIR)/* $(RM) $(OUT) config.mk $(OBJDIR)/*
.PHONY: default clean .PHONY: default clean

15
configure vendored
View File

@ -5,28 +5,15 @@ RM=${RM:-rm -f}
CFLAGS=${CFLAGS:-} CFLAGS=${CFLAGS:-}
LDFLAGS=${LDFLAGS:-} LDFLAGS=${LDFLAGS:-}
OUT=${OUT:-game} OUT=${OUT:-game}
SIZE=${SIZE:-10}
DEFX=${DEFX:-0}
DEFY=${DEFY:-0}
echo "Makefile configuration:"
echo "Compiler: $CC" echo "Compiler: $CC"
echo "Remove: $RM" echo "Remove: $RM"
echo "CFLAGS: $CFLAGS" echo "CFLAGS: $CFLAGS"
echo "LDFLAGS: $LDFLAGS" echo "LDFLAGS: $LDFLAGS"
echo "Out file: $OUT" echo "Out file: $OUT"
echo
echo "Code configuration:"
echo "Size: $SIZE"
echo "Start x: $DEFX"
echo "Start y: $DEFY"
echo "CC = $CC echo "CC = $CC
RM = $RM RM = $RM
CFLAGS = $CFLAGS CFLAGS = $CFLAGS
LDFLAGS = $LDFLAGS LDFLAGS = $LDFLAGS
OUT = $OUT" > config/config.mk OUT = $OUT" > config.mk
echo "#define SIZE $SIZE
#define DEFX $DEFX
#define DEFY $DEFY" > config/config.h

View File

@ -9,7 +9,6 @@
#include "screen.h" #include "screen.h"
#include "player.h" #include "player.h"
#include "food.h" #include "food.h"
#include "config.h"
void drawPlayer(Player *player, Screen *screen) void drawPlayer(Player *player, Screen *screen)
{ {
@ -23,7 +22,7 @@ Food generateFood(Player *player)
Food food; Food food;
do do
{ {
food = (Food){random() % SIZE, random() % SIZE}; food = (Food){random() % 10, random() % 10};
} while (playerCheckFoodCollision(player, food)); } while (playerCheckFoodCollision(player, food));
return food; return food;
} }
@ -31,8 +30,8 @@ Food generateFood(Player *player)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
srandom(time(NULL)); srandom(time(NULL));
Player *player = playerCreate(DOWN, DEFX, DEFY, 0); Player *player = playerCreate(DOWN, 0, 0, 0);
Screen *screen = screenCreate(SIZE, SIZE, ' '); Screen *screen = screenCreate(10, 10, ' ');
PlayerNode *node; PlayerNode *node;
pthread_t input_thread; pthread_t input_thread;
int head_x, head_y; int head_x, head_y;
@ -69,7 +68,7 @@ int main(int argc, char **argv)
} }
head_x = player->head->x; head_x = player->head->x;
head_y = player->head->y; head_y = player->head->y;
if (head_x >= SIZE || head_x < 0 || head_y >= SIZE || head_y < 0) if (head_x >= 10 || head_x < 0 || head_y >= 10 || head_y < 0)
{ {
*running = false; *running = false;
break; break;