diff --git a/Start_Windows/game.c b/Start_Windows/game.c index e05da03..f01c4f0 100644 --- a/Start_Windows/game.c +++ b/Start_Windows/game.c @@ -30,7 +30,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi for (int try = 0; (try < MAX_RAND_TRIES_PER_WORD) && !placed; try++) { - int horizontal = rand() % 2; + int horizontal = rand() % 2; // 0 vertikal --> 1 horizontal int x = rand() % searchFieldLen; int y = rand() % searchFieldLen; @@ -46,7 +46,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi for (int i = 0; i < wordlength; i++) // position already occupied by other word { - if (salad[y][x + 1] != EMPTY_CHAR) + if (salad[y][x + i] != EMPTY_CHAR) { fits = 0; break; @@ -57,7 +57,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi { for (int i = 0; i < wordlength; i++) { - salad[y][x + 1] = words[wordNumber][i]; + salad[y][x + i] = words[wordNumber][i]; } placed = 1; placedWords++; @@ -75,7 +75,6 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi for (int i = 0; i < wordlength; i++) // position already occupied by other word { if (salad[y + 1][x] != EMPTY_CHAR) - ; { fits = 0; break; @@ -85,7 +84,7 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi { for (int i = 0; i < wordlength; i++) { - salad[y + 1][x] = words[wordNumber][i]; + salad[y + i][x] = words[wordNumber][i]; } placed = 1; placedWords++; diff --git a/Start_Windows/runTests.exe b/Start_Windows/runTests.exe index 7912663..da58ebc 100644 Binary files a/Start_Windows/runTests.exe and b/Start_Windows/runTests.exe differ diff --git a/Start_Windows/wordsalad.exe b/Start_Windows/wordsalad.exe index 085c695..d1cf31e 100644 Binary files a/Start_Windows/wordsalad.exe and b/Start_Windows/wordsalad.exe differ diff --git a/Start_Windows/wordsalad_initial.exe b/Start_Windows/wordsalad_initial.exe new file mode 100644 index 0000000..b7aafb9 Binary files /dev/null and b/Start_Windows/wordsalad_initial.exe differ