diff --git a/Startcode/game.c b/Startcode/game.c index 11b04b1..6bc3784 100644 --- a/Startcode/game.c +++ b/Startcode/game.c @@ -27,9 +27,8 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi maxLength = findmaxLength(words, wordCount); // Size of Field! if (searchFieldLen < maxLength) - sizeOfField = maxLength; - else - sizeOfField = searchFieldLen; + return returnValue; + sizeOfField = searchFieldLen; initializeField(sizeOfField, salad); // for all words put them in for (unsigned int i = 0; i < wordCount; i++){ diff --git a/Startcode/input.c b/Startcode/input.c index 81b2433..65541fd 100644 --- a/Startcode/input.c +++ b/Startcode/input.c @@ -9,7 +9,7 @@ // Read words from file and store in 'words' array static int createSingleWords(char text[MAX_LINE_LEN], char words[][MAX_WORD_LEN], unsigned int maxWordCount); -int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) +unsigned int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount) { int wordCount = 0; char lineRead[MAX_LINE_LEN]; diff --git a/Startcode/input.h b/Startcode/input.h index 032ec28..265de42 100644 --- a/Startcode/input.h +++ b/Startcode/input.h @@ -6,6 +6,6 @@ #define MAX_WORD_LEN 100 #define MAX_LINE_LEN 1024 -int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount); +unsigned int readWords(FILE *file, char words[][MAX_WORD_LEN], unsigned int maxWordCount); #endif diff --git a/Startcode/main.c b/Startcode/main.c index fb36aef..313708c 100644 --- a/Startcode/main.c +++ b/Startcode/main.c @@ -47,6 +47,7 @@ int main(int argc, char *argv[]) // Start the game if successful // error message if some words couldn't be placed + } else {