merge upstream

Start_Windows/game.c

@@ -13,7 +13,7 @@
 // Creates the word salad by placing words randomly and filling empty spaces
 int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
-
+Printf("Hello World+1");
 }
 
 // Prints the word salad to console

Start_Windows/input.c

@@ -8,5 +8,30 @@
 // Read words from file and store in 'words' array
 int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount)
 {
+    //kein fopen und close nötig, weil dies schon in der main passiert und mit *file übergeben wird//
+    
+
+if (!file)
+{
+    perror("Error invalid pointer to file");
+    return -1;
+} 
+
+char line[1024];
+unsigned int count = 0;
+
+while (fgets(line, sizeof(line), file) && count < maxWordCount)
+{
+    line[strcspn(line, "\n")] = '\0';
+
+    char *token = strtok(line, " ;,");
+while (token && count < maxWordCount)
+{
+    strcpy(words[count], token);
+    count++;
+    token = strtok(NULL, " ;,");
+}
 
 }
+return count;
+}

Start_Windows/main.c

@@ -40,7 +40,14 @@ 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
-
+            if (wordCount != placedWords)
+            {
+                fprintf(stderr, "Error: %u out of %u were placed\n", placedWords, wordCount);
+            }
+            else
+            {
+                 startGame(wordSalad, SALAD_SIZE, words, placedWords, 1024);
+            }
         }
         else
         {