diff --git a/Startcode/main.c b/Startcode/main.c index e8a3b20..7931401 100644 --- a/Startcode/main.c +++ b/Startcode/main.c @@ -37,11 +37,10 @@ int main(int argc, char *argv[]) placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); - - // TODO: - // Check if all words were successfully placed - // Start the game if successful - // error message if some words couldn't be placed + if(placedWords == wordCount) + { + startGame(wordSalad, SALAD_SIZE, words, wordCount, 800); + } } else diff --git a/Startcode/makefile b/Startcode/makefile index bd18f6c..b9298a3 100644 --- a/Startcode/makefile +++ b/Startcode/makefile @@ -26,9 +26,11 @@ wordsalad_initial: # Normales Spiel bauen # -------------------------- -wordsalad_myversion: main.o input.o $(BINARIES)/libraylib.a - $(CC) $(CFLAGS) -o wordsalad_myversion main.o input.o$(BINARIES)/libraylib.a $(LDFLAGS) +wordsalad_myversion: input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_myversion input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) +wordsalad_2: main.o input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_2 main.o input.o $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) wordsalad: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(CC) $(CFLAGS) -o wordsalad main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a $(LDFLAGS)