diff --git a/Start_Windows/main.c b/Start_Windows/main.c index 03da755..c591f9c 100644 --- a/Start_Windows/main.c +++ b/Start_Windows/main.c @@ -7,6 +7,13 @@ #define MAX_NUMBER_OF_WORDS 100 #define SALAD_SIZE 20 +// selbstgeschriebene Definitionen: +// annahmen ist das windowWidth in pixeln gegeben +// werden muss, da auch andere funktionen wie +// createCharSquarePanel in Pixeln arbeiten +#define WINDOW_WIDTH 540 + + int main(int argc, char *argv[]) { int exitCode = EXIT_SUCCESS; @@ -36,10 +43,24 @@ int main(int argc, char *argv[]) // Create the word salad by placing words into grid placedWords = createWordSalad(wordSalad, SALAD_SIZE, words, wordCount); - // TODO: + // DONE: // Check if all words were successfully placed // Start the game if successful // error message if some words couldn't be placed + if (placedWords != wordCount) + { + // selbe error message wird auch von wordsalad_inital.exe ausgegeben, + // wenn diese einen fehler produziert + printf("Could only place %d of %d words.", placedWords, wordCount); + printf(" Possible solution is to choose a larger search field ...\n"); + } + else + { + // annahme: windowWidth wird in Pixeln gesucht, + // da auch andere funktionen, wie createCharSquarePanel + // in Pixeln arbeiten + startGame(wordSalad, MAX_SEARCH_FIELD_LEN, words, placedWords, WINDOW_WIDTH); + } } else diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 146a8c6..ba8e456 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -13,6 +13,13 @@ wordsalad_initial: $(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS) +# -------------------------- +# eigenes Spiel bauen +# -------------------------- +wordsalad_myversion: + $(CC) -o $(CFLAGS) main.c $(BINARIES)/libwordsalad.a + + # -------------------------- # Normales Spiel bauen # -------------------------- diff --git a/Start_Windows/wordsalad_initial.exe b/Start_Windows/wordsalad_initial.exe new file mode 100644 index 0000000..1b99da7 Binary files /dev/null and b/Start_Windows/wordsalad_initial.exe differ