diff --git a/Startcode/main.c b/Startcode/main.c index 03da755..6182b09 100644 --- a/Startcode/main.c +++ b/Startcode/main.c @@ -38,8 +38,20 @@ int main(int argc, char *argv[]) // 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) + { + // Start the game if successful + startGame(wordSalad, SALAD_SIZE, words, wordCount, 600); + } + else + { + // error message if some words couldn't be placed + fprintf(stderr, "Fehler. Es konnten nicht alle Wörter Platziert werden."); + exitCode = EXIT_FAILURE; + } + + + } else diff --git a/Startcode/makefile b/Startcode/makefile index 7cf1d4c..209d2fc 100644 --- a/Startcode/makefile +++ b/Startcode/makefile @@ -22,6 +22,12 @@ codefolder = . wordsalad_initial: $(CC) -o wordsalad_initial -L. $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) +# Eigenes Target + +wordsalad_myversion: main.o graphicalGame.o $(BINARIES)/libraylib.a + $(CC) $(CFLAGS) -o wordsalad_myversion main.o graphicalGame.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS) + + # -------------------------- # Normales Spiel bauen # -------------------------- @@ -55,5 +61,5 @@ clean: ifeq ($(OS),Windows_NT) del /f *.o *.exe else - rm -f *.o wordsalad $(TEST_BIN) + rm -f *.o wordsalad wordsalad_initial wordsalad_myversion $(TEST_BIN) endif \ No newline at end of file diff --git a/Startcode/wordsalad_myversion b/Startcode/wordsalad_myversion new file mode 100755 index 0000000..86735a7 Binary files /dev/null and b/Startcode/wordsalad_myversion differ