main.c fertig angepasst

Start_Linux/makefile

@@ -1,9 +1,9 @@
 CC = gcc
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -I$(raylibfolder)
 LDFLAGS = -lGL -lX11 -lm
 BINARIES = ./linux
 
-raylibfolder = ./raylib
+raylib_folder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -28,7 +28,7 @@ game.o: game.c
 	$(CC) $(CFLAGS) -c game.c
 
 graphicalGame.o: graphicalGame.c
-	$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
+	$(CC) $(CFLAGS) -c graphicalGame.c
 
 # --------------------------
 # Unit Tests

Start_Mac/input.c

@@ -4,9 +4,42 @@
 
 // TODO:
 // eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
-
+/** 
+ * @param file Zeiger auf die geöffnete Datei
+ * @param words 2D-Array zum Speichern der Wörter
+ * @param maxWordCount Maximale Anzahl von Wörtern, die eingelesen werden sollen
+ * @return Anzahl der eingelesenen Wörter
+ */
 // Read words from file and store in 'words' array
+// ERLEDIGT
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
+    if (file == NULL || words == NULL || maxWordCount == 0) {
+        return 0;
+    }
     
+    int wordCount = 0;
+    char line[MAX_LINE_LEN];
+    
+    // Zeilen einlesen
+    while (wordCount < maxWordCount && fgets(line, MAX_LINE_LEN, file) != NULL) {
+        // Zeile in Wörter aufteilen (Trennzeichen: Leerzeichen, Komma, Semikolon, Newline)
+        char *token = strtok(line, " ,;\t\n\r");
+        
+        while (token != NULL && wordCount < maxWordCount) {
+            // Prüfen ob Token nicht leer ist
+            if (strlen(token) > 0 && strlen(token) < MAX_WORD_LEN) {
+                // Wort kopieren und in Großbuchstaben umwandeln
+                strcpy(words[wordCount], token);
+                for (int i = 0; words[wordCount][i] != '\0'; i++) {
+                    words[wordCount][i] = toupper((unsigned char)words[wordCount][i]);
+                }
+                wordCount++;
+            }
+            // Nächstes Wort
+            token = strtok(NULL, " ,;\t\n\r");
+        }
+    }
+    
+    return wordCount;
 }

Start_Mac/main.c

@@ -37,10 +37,22 @@ 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
             
+            // Check if all words were successfully placed
+            if(placedWords == wordCount)
+            {
+                // Start the game if successful
+                printf("All %u words were successfully placed in the word salad!\n", wordCount);
+                createWordSalad(wordSalad, SALAD_SIZE, words, wordCount);
+                showWordSalad(wordSalad, SALAD_SIZE);
+            }
+            else
+            {
+                // Error message if some words couldn't be placed
+                fprintf(stderr, "Error: Only %u out of %u words could be placed in the word salad.\n", 
+                        placedWords, wordCount);
+                exitCode = EXIT_FAILURE;
+            }   
         }
         else
         {

Start_Mac/makefile

@@ -4,7 +4,7 @@ LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -f
 ARCH := $(shell uname -m)
 BINARIES = ./macos-$(ARCH)
 
-raylibfolder = ./raylib
+raylib_folder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -43,4 +43,4 @@ test: input.o game.o unit_tests.c $(BINARIES)/libunity.a
 # Clean
 # --------------------------
 clean:
-	rm -f *.o wordsalad $(TEST_BIN)
+	rm -f *.o wordsalad

Start_Windows/makefile

@@ -1,9 +1,9 @@
 CC = gcc
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -I$(raylibfolder)
 LDFLAGS = -lopengl32 -lgdi32 -lwinmm
 BINARIES = ./windows
 
-raylibfolder = ./raylib
+raylib_folder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -12,6 +12,7 @@ unityfolder = ./unity
 wordsalad_initial:
 	$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
 
+
 # --------------------------
 # Normales Spiel bauen
 # --------------------------
@@ -28,7 +29,7 @@ game.o: game.c
 	$(CC) -c $(CFLAGS) game.c
 
 graphicalGame.o: graphicalGame.c
-	$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c
+	$(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c
 
 # --------------------------
 # Unit Tests