diff --git a/Start_Windows/input.c b/Start_Windows/input.c index ed77805..7bbe95a 100644 --- a/Start_Windows/input.c +++ b/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// + -} \ No newline at end of file +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; +} diff --git a/Start_Windows/main.c b/Start_Windows/main.c index bc48730..dfbf11f 100644 --- a/Start_Windows/main.c +++ b/Start_Windows/main.c @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) } else { - startGame(wordSalad, SALAD_SIZE, words, placedWords, 800); + startGame(wordSalad, SALAD_SIZE, words, placedWords, 1024); } } else diff --git a/Start_Windows/wordsalad_initial.exe b/Start_Windows/wordsalad_initial.exe index d06efb3..339a53c 100644 Binary files a/Start_Windows/wordsalad_initial.exe and b/Start_Windows/wordsalad_initial.exe differ