Teil 1 von game.c

Startcode/input.c

@@ -4,44 +4,49 @@
 
 // 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)
 {
-    int c = 0;
+    unsigned int wordCount = 0;
-    int count = 0;
+    unsigned int charIndex = 0;
-    int letterCount = 0;
+    int c;
-    while (count < maxWordCount)
+
-    {
+    if (file == NULL) {
-        while ((c = fgetc(file)) != EOF) //Leerzeichen prüfen
+        return 0;
-        {
+    }
-            if (isspace(c) || !isalpha(c)) {
+
-                if (letterCount > 0) {
+    while ((c = fgetc(file)) != EOF) {
-                    break;  //Wort fertig eingelesen
+
+        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;
                 }
-
-                continue; // mehrere Leerzeichen oder Sonderzeichen überspringen
             }
-
-            if (letterCount < MAX_WORD_LEN - 1) //wörter Buchstabenweise einlesen
-                {
-                words[count][letterCount] = (char)toupper(c);
-                letterCount++;
             }
-        }
+        else {
+            if (wordCount < maxWordCount &&
+                charIndex < MAX_WORD_LEN - 1) {
 
-        if (letterCount == 0) {
+                words[wordCount][charIndex] = (char)c;
-            break;  //kein weiteres Wort gefunden
+                charIndex++;
-        }
+                }
-
-        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;
+}