Refactor game.c

Startcode/game.c

@@ -7,9 +7,9 @@
 #define MAX_RAND_TRIES_PER_WORD 10
 #define EMPTY_CHAR 0
 
-int placeWord(int len, int column, int row,
-              char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
-              int searchFieldLen, const char* word, int axis);
+
+int placeWord(const char* word, int wordLength, char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
+              int searchFieldLen, int column, int row, int axis);
 
 // Creates the word salad by placing words randomly and filling empty spaces
 int createWordSalad(
@@ -48,18 +48,13 @@ int createWordSalad(
             int row = rand() % searchFieldLen;
             int column = rand() % searchFieldLen;
 
-            int success = placeWord(
-                wordlenght, column, row, salad,
-                searchFieldLen, words[w], axis);
+            int success = placeWord( words[w],wordlenght, salad, searchFieldLen, column, row, axis);
 
             if (success)
             {
                 placedWords++;
                 break;
             }
-
-            printf("Platzierung zum %d. Mal fehlgeschlagen!\n",
-                   attempts + 1);
         }
     }
 
@@ -79,16 +74,15 @@ int createWordSalad(
 }
 
 
-int placeWord(int len, int column, int row,
-              char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
-              int searchFieldLen, const char* word, int axis)
+int placeWord(const char* word, int wordLength, char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN],
+              int searchFieldLen, int column, int row, int axis)
 {
     // Available space check & word collision avoidance
-    for (int i = 0; i < len; i++)
+    for (int i = 0; i < wordLength; i++)
     {
         if (axis == 0) // Horizontal
         {
-            if (column + len > searchFieldLen ||
+            if (column + wordLength > searchFieldLen ||
                 salad[row][column + i] != EMPTY_CHAR)
             {
                 return 0;
@@ -96,7 +90,7 @@ int placeWord(int len, int column, int row,
         }
         else // Vertical
         {
-            if (row + len > searchFieldLen ||
+            if (row + wordLength > searchFieldLen ||
                 salad[row + i][column] != EMPTY_CHAR)
             {
                 return 0;
@@ -105,7 +99,7 @@ int placeWord(int len, int column, int row,
     }
 
     //Write Word
-    for (int i = 0; i < len; i++)
+    for (int i = 0; i < wordLength; i++)
     {
         if (axis == 0) // Horizontal
         {