Implementierung von game.c

Startcode/input.c

@@ -4,49 +4,44 @@
 
 // TODO:
 // eine Funktion implementieren, die ein einzelnes Wort aus einer Textdatei (words.txt) einliest und als C-String zurückgibt.
-
+// Test 123
 // Read words from file and store in 'words' array
-int readWords(FILE *file, char words[][MAX_WORD_LEN],
-              unsigned int maxWordCount)
+int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
-    unsigned int wordCount = 0;
-    unsigned int charIndex = 0;
-    int c;
-
-    if (file == NULL) {
-        return 0;
-    }
-
-    while ((c = fgetc(file)) != EOF) {
-
-        if (c == ',' || c == ';' || c == ' ' ||
-            c == '\n' || c == '\t' || c == '\r') {
-
-            if (charIndex > 0) {
-                words[wordCount][charIndex] = '\0';
-
-                wordCount++;
-                charIndex = 0;
-
-                if (wordCount >= maxWordCount) {
-                    return (int)wordCount;
+    int c = 0;
+    int count = 0;
+    int letterCount = 0;
+    while (count < maxWordCount)
+    {
+        while ((c = fgetc(file)) != EOF) //Leerzeichen prüfen
+        {
+            if (isspace(c) || !isalpha(c)) {
+                if (letterCount > 0) {
+                    break;  //Wort fertig eingelesen
                 }
-            }
-            }
-        else {
-            if (wordCount < maxWordCount &&
-                charIndex < MAX_WORD_LEN - 1) {
 
-                words[wordCount][charIndex] = (char)c;
-                charIndex++;
-                }
+                continue; // mehrere Leerzeichen oder Sonderzeichen überspringen
+            }
+
+            if (letterCount < MAX_WORD_LEN - 1) //wörter Buchstabenweise einlesen
+                {
+                words[count][letterCount] = (char)toupper(c);
+                letterCount++;
+            }
+        }
+
+        if (letterCount == 0) {
+            break;  //kein weiteres Wort gefunden
+        }
+
+        words[count][letterCount] = '\0';
+        letterCount = 0;
+        count++;
+
+        if (c == EOF) {
+            break;
         }
     }
+    return count;
+}
 
-    if (charIndex > 0 && wordCount < maxWordCount) {
-        words[wordCount][charIndex] = '\0';
-        wordCount++;
-    }
-
-    return (int)wordCount;
-}