From 8adb201876b6bd7d194e4895b09e7dbef4f014ca Mon Sep 17 00:00:00 2001 From: Kristin Date: Sun, 2 Nov 2025 16:56:58 +0100 Subject: [PATCH] angepasstes makefile --- Start_Windows/game.c | 34 ++++++++----------- Start_Windows/input.c | 48 +++++++++++---------------- Start_Windows/main.c | 20 ++++++++--- Start_Windows/makefile | 12 ++++--- Start_Windows/windows/libwordsalad.a | Bin 13170 -> 0 bytes 5 files changed, 55 insertions(+), 59 deletions(-) delete mode 100644 Start_Windows/windows/libwordsalad.a diff --git a/Start_Windows/game.c b/Start_Windows/game.c index 3643d59..912df75 100644 --- a/Start_Windows/game.c +++ b/Start_Windows/game.c @@ -20,7 +20,6 @@ int createWordSalad( unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount) { - srand(time(NULL)); enum Richtung { HORIZONTAL, VERTIKAL }; // wipe field @@ -33,7 +32,7 @@ int createWordSalad( salad[y][x] = EMPTY_CHAR; } } - int placedWords = 0; // variable platzierte Wörter + unsigned int placedWords = 0; // variable platzierte Wörter // place words // for schleife mit wortzahl = 0 bis wordCount @@ -59,18 +58,16 @@ int createWordSalad( int y = rand() % searchFieldLen; int fits = 1; - if (r == HORIZONTAL) { + if (r == VERTIKAL) { if ((y + wortLen) > (searchFieldLen)) { fits = 0; } - if (fits) { - for (int i = 0; i < wortLen; i++) { - char var = salad[y + i][x]; - if (var != EMPTY_CHAR) { - fits = 0; - } + for (int i = 0; (i < wortLen) && (fits != 0); i++) { + char var = salad[y + i][x]; + if (var != EMPTY_CHAR) { + fits = 0; } } @@ -80,26 +77,22 @@ int createWordSalad( salad[y + i][x] = words[wortNummer][i]; } - - platziert = 1; placedWords++; + platziert = 1; } } - else if (r == VERTIKAL) { + else if (r == HORIZONTAL) { if ((x + wortLen) > searchFieldLen) { fits = 0; } - if (fits) { - - for (int i = 0; i < wortLen; i++) { - char var = salad[y][x + i]; - if (var != EMPTY_CHAR) { - fits = 0; - } + for (int i = 0; (i < wortLen) && (fits != 0); i++) { + char var = salad[y][x + i]; + if (var != EMPTY_CHAR) { + fits = 0; } } @@ -109,9 +102,8 @@ int createWordSalad( salad[y][x + i] = words[wortNummer][i]; } - - platziert = 1; placedWords++; + platziert = 1; } } diff --git a/Start_Windows/input.c b/Start_Windows/input.c index 0c687a2..8912dca 100644 --- a/Start_Windows/input.c +++ b/Start_Windows/input.c @@ -2,10 +2,6 @@ #include #include -// TODO: -// eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei -// (words.txt) einliest und als C-String zurückgibt. - // Read words from file and store in 'words' array int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) { @@ -15,40 +11,34 @@ int readWords(FILE *file, char words[][MAX_WORD_LEN], return 0; } - // zunächst fehlerhaften String einlesen und in anderem Array - // zwischenspeichern - char line[MAX_LINE_LEN]; - char *token; - int wordCount = 0; + unsigned int wordCount = 0; - while (fgets(line, sizeof(line), file) != - NULL && // während mit fgets alle Zeichen aus dem file eingelesen - // werden - wordCount < maxWordCount) { + while ((fgets(line, sizeof(line), file) != NULL) && + (wordCount < maxWordCount)) { + + // Token initialisieren + char *token = strtok(line, " ,;.\n"); - token = strtok(line, " ;,.\n"); // Erstes Wort mit strtok aus dem - // fehlerhaften String herauslösen + while (token && (wordCount < maxWordCount)) { - while (token != NULL && - wordCount < maxWordCount) { // while strtok nicht am Ende ist und - // noch Wörter in words passen - - for (int i = 0; token[i] != '\0'; i++) { - token[i] = toupper((unsigned char)token[i]); + if (*token == '\0') { + token = strtok(NULL, " ,;.\n"); + continue; } - strncpy(words[wordCount], token, - sizeof(words[wordCount]) - - 1); // mit strcpy das aktuelle Wort in words kopieren - words[wordCount][sizeof(words[wordCount]) - 1] = - '\0'; // Nullterminator mit sizeof des aktuellen Worts - 1 an Ende des - // Worts setzen + // Token in Großbuchstaben konvertieren + for (int i = 0; token[i] != '\0'; i++) { + token[i] = toupper(token[i]); + } + + // In das words-Array kopieren + strcpy(words[wordCount], token); wordCount++; // Nächstes Wort - token = strtok(NULL, " ;,.\n"); // Nächstes Token + token = strtok(NULL, " ,;.\n"); // Nächstes Token } } return wordCount; // Anzahl der eingelesenen Wörter -} \ No newline at end of file +} diff --git a/Start_Windows/main.c b/Start_Windows/main.c index 74024e1..d34f0e6 100644 --- a/Start_Windows/main.c +++ b/Start_Windows/main.c @@ -3,11 +3,13 @@ #include "input.h" #include #include +#include #define MAX_NUMBER_OF_WORDS 100 #define SALAD_SIZE 20 int main(int argc, char *argv[]) { + srand(time(NULL)); int exitCode = EXIT_SUCCESS; // Check if the correct number of arguments is provided @@ -15,8 +17,8 @@ int main(int argc, char *argv[]) { fprintf(stderr, "Usage: %s \n", argv[0]); exitCode = EXIT_FAILURE; } else { - char words[MAX_NUMBER_OF_WORDS] - [MAX_WORD_LEN]; // Array to hold the words to be used in the game + char words[MAX_NUMBER_OF_WORDS][MAX_WORD_LEN] = { + {0}}; // Array to hold the words to be used in the game unsigned int wordCount = 0; FILE *file = fopen(argv[1], "r"); @@ -37,11 +39,21 @@ int main(int argc, char *argv[]) { // Check if all words were successfully placed // Start the game if successful // error message if some words couldn't be placed + printf("Placed Words: %d\n", placedWords); + printf("Word Count:%d\n", wordCount); + int var = 0; + for (unsigned int i = 0; i < wordCount; i++) { + printf("Word %u: %s ", i, words[i]); + if (var == 10) { + printf("\n"); + var = 0; + } + } if (placedWords == wordCount) { - startGame(wordSalad, SALAD_SIZE, words, wordCount, - MAX_SEARCH_FIELD_LEN); + startGame(wordSalad, SALAD_SIZE, words, placedWords, 1024); + } else diff --git a/Start_Windows/makefile b/Start_Windows/makefile index 9d66779..71c2fab 100644 --- a/Start_Windows/makefile +++ b/Start_Windows/makefile @@ -15,16 +15,18 @@ wordsalad_initial: #--------------------------- # eigenes Target bauen #--------------------------- -wordsalad_myversion: main.o graphicalGame.o - $(CC) -o wordsalad_myversion main.o $(BINARIES)/libwordsalad.a $(BINARIES)/libraylib.a $(LDFLAGS) - +wordsalad_myversion: main.o graphicalGame.o input.o game.o + $(CC) main.o graphicalGame.o input.o game.o -o wordsalad_myversion $(BINARIES)/libraylib.a $(LDFLAGS) # -------------------------- # Normales Spiel bauen # -------------------------- -all: main.o input.o game.o graphicalGame.o $(BINARIES)/libraylib.a +all: $(BINARIES)/libwordsalad.a 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) +$(BINARIES)/libwordsalad.a: main.o input.o game.o graphicalGame.o + ar rcs $(BINARIES)/libwordsalad.a main.o input.o game.o graphicalGame.o + main.o: main.c $(CC) -c $(CFLAGS) main.c @@ -49,4 +51,4 @@ test: input.o game.o unit_tests.c # Clean # -------------------------- clean: - rm -f *.o *.exe + rm -f *.o *.exe $(BINARIES)/libwordsalad.a diff --git a/Start_Windows/windows/libwordsalad.a b/Start_Windows/windows/libwordsalad.a deleted file mode 100644 index 06a447c298115451687397f45e1041d85a457997..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13170 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 bIC*bVv&3=Dow1%sM?)l*2!jdUg7p6YG~#lc